From f94e2a1518200aae93ea5962c116dc0008d162ed Mon Sep 17 00:00:00 2001 From: Raymond Knopp Date: Fri, 14 Nov 2014 07:59:04 +0000 Subject: [PATCH] git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6012 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair2/UTIL/OMG/omg_constants.h | 2 +- openair2/UTIL/OMG/rwalk.c | 6 +++--- openair2/UTIL/OMG/rwp.c | 6 +++--- openair2/UTIL/OMG/steadystaterwp.c | 6 +++--- openair2/UTIL/OMG/trace.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/openair2/UTIL/OMG/omg_constants.h b/openair2/UTIL/OMG/omg_constants.h index b48db3801e..834e694e13 100644 --- a/openair2/UTIL/OMG/omg_constants.h +++ b/openair2/UTIL/OMG/omg_constants.h @@ -74,7 +74,7 @@ MAX_NUM_NODE_TYPES /*!< All the types. Used to perform the same operations to al //#define eps 0.00000095367431649629 /*! A constant used to compare two doubles */ -#define eps 0.10 //10.99 +#define omg_eps 0.10 //10.99 #define SLEEP 1 #define GET_DATA 0 diff --git a/openair2/UTIL/OMG/rwalk.c b/openair2/UTIL/OMG/rwalk.c index 4f839ccf0c..ac37b70446 100644 --- a/openair2/UTIL/OMG/rwalk.c +++ b/openair2/UTIL/OMG/rwalk.c @@ -349,8 +349,8 @@ update_rwalk_nodes (double cur_time) //case1:time to next event equals to current time if (tmp->pair != NULL - && ((double) tmp->pair->next_event_t >= cur_time - eps) - && ((double) tmp->pair->next_event_t <= cur_time + eps)) + && ((double) tmp->pair->next_event_t >= cur_time - omg_eps) + && ((double) tmp->pair->next_event_t <= cur_time + omg_eps)) { if (my_node->mobile == 1) sleep_rwalk_node (tmp->pair, cur_time); @@ -361,7 +361,7 @@ update_rwalk_nodes (double cur_time) //case2: current time is greater than the time to next event else if (tmp->pair != NULL - && (cur_time - eps) > tmp->pair->next_event_t) + && (cur_time - omg_eps) > tmp->pair->next_event_t) { while (cur_time >= tmp->pair->next_event_t) diff --git a/openair2/UTIL/OMG/rwp.c b/openair2/UTIL/OMG/rwp.c index 9119e2cce4..11a8560274 100644 --- a/openair2/UTIL/OMG/rwp.c +++ b/openair2/UTIL/OMG/rwp.c @@ -324,8 +324,8 @@ update_rwp_nodes (double cur_time) //case1:time to next event equals to current time if (tmp->pair != NULL - && ((double) tmp->pair->next_event_t >= cur_time - eps) - && ((double) tmp->pair->next_event_t <= cur_time + eps)) + && ((double) tmp->pair->next_event_t >= cur_time - omg_eps) + && ((double) tmp->pair->next_event_t <= cur_time + omg_eps)) { if (my_node->mobile == 1) sleep_rwp_node (tmp->pair, cur_time); @@ -336,7 +336,7 @@ update_rwp_nodes (double cur_time) //case2: current time is greater than the time to next event else if (tmp->pair != NULL - && (cur_time - eps) > tmp->pair->next_event_t) + && (cur_time - omg_eps) > tmp->pair->next_event_t) { while (cur_time >= tmp->pair->next_event_t) diff --git a/openair2/UTIL/OMG/steadystaterwp.c b/openair2/UTIL/OMG/steadystaterwp.c index 87324c8c6e..edf3081fb9 100644 --- a/openair2/UTIL/OMG/steadystaterwp.c +++ b/openair2/UTIL/OMG/steadystaterwp.c @@ -529,8 +529,8 @@ update_steadystaterwp_nodes (double cur_time) //case1:time to next event equals to current time if (tmp->pair != NULL - && ((double) tmp->pair->next_event_t >= cur_time - eps) - && ((double) tmp->pair->next_event_t <= cur_time + eps)) + && ((double) tmp->pair->next_event_t >= cur_time - omg_eps) + && ((double) tmp->pair->next_event_t <= cur_time + omg_eps)) { if (my_node->mobile == 1) sleep_rwp_node (tmp->pair, cur_time); @@ -541,7 +541,7 @@ update_steadystaterwp_nodes (double cur_time) //case2: current time is greater than the time to next event else if (tmp->pair != NULL - && (cur_time - eps) > tmp->pair->next_event_t) + && (cur_time - omg_eps) > tmp->pair->next_event_t) { while (cur_time >= tmp->pair->next_event_t) diff --git a/openair2/UTIL/OMG/trace.c b/openair2/UTIL/OMG/trace.c index 0130c34a8c..f66ffe2d47 100644 --- a/openair2/UTIL/OMG/trace.c +++ b/openair2/UTIL/OMG/trace.c @@ -296,7 +296,7 @@ update_trace_nodes (double cur_time) //case1:time to next event equals to current time - if (tmp->pair != NULL && tmp->pair->next_event_t >= cur_time - eps + if (tmp->pair != NULL && tmp->pair->next_event_t >= cur_time - omg_eps && tmp->pair->next_event_t <= cur_time ) { if (node_n->next->next == NULL)