Renamed UE_MEASUREMENTS_DELAY to UE_MEASUREMENT_REPORT_DELAY in LteUeRrc
authorBudiarto Herman <budiarto.herman@magister.fi>
Thu, 17 Oct 2013 16:45:42 +0300
changeset 10377 efe5d9a94cb9
parent 10376 e040472b2b56
child 10378 d54dbdb31bdb
Renamed UE_MEASUREMENTS_DELAY to UE_MEASUREMENT_REPORT_DELAY in LteUeRrc
src/lte/model/lte-ue-rrc.cc
src/lte/model/lte-ue-rrc.h
src/lte/test/lte-test-ue-measurements.cc
--- a/src/lte/model/lte-ue-rrc.cc	Thu Oct 17 15:16:51 2013 +0300
+++ b/src/lte/model/lte-ue-rrc.cc	Thu Oct 17 16:45:42 2013 +0300
@@ -2426,7 +2426,7 @@
   NS_ASSERT (!measReportIt->second.cellsTriggeredList.empty ());
   measReportIt->second.numberOfReportsSent = 0;
   measReportIt->second.periodicReportTimer
-    = Simulator::Schedule (UE_MEASUREMENTS_DELAY,
+    = Simulator::Schedule (UE_MEASUREMENT_REPORT_DELAY,
                            &LteUeRrc::SendMeasurementReport,
                            this, measId);
 
@@ -2481,7 +2481,7 @@
 
   if (reportOnLeave)
     {
-      // runs immediately without UE_MEASUREMENTS_DELAY
+      // runs immediately without UE_MEASUREMENT_REPORT_DELAY
       SendMeasurementReport (measId);
     }
 
--- a/src/lte/model/lte-ue-rrc.h	Thu Oct 17 15:16:51 2013 +0300
+++ b/src/lte/model/lte-ue-rrc.h	Thu Oct 17 16:45:42 2013 +0300
@@ -53,7 +53,7 @@
  *  - time-to-trigger check is always performed before the reporting, so there
  *    would still be chance for it to cancel the reporting if necessary.
  */
-static const Time UE_MEASUREMENTS_DELAY = MicroSeconds (1);
+static const Time UE_MEASUREMENT_REPORT_DELAY = MicroSeconds (1);
 
 
 class LteRlc;
--- a/src/lte/test/lte-test-ue-measurements.cc	Thu Oct 17 15:16:51 2013 +0300
+++ b/src/lte/test/lte-test-ue-measurements.cc	Thu Oct 17 16:45:42 2013 +0300
@@ -311,7 +311,7 @@
    * Prior attempt to use seconds as unit of choice resulted in precision lost.
    * Therefore milliseconds are used now instead.
    */
-  v.push_back (MilliSeconds (ms) + UE_MEASUREMENTS_DELAY);
+  v.push_back (MilliSeconds (ms) + UE_MEASUREMENT_REPORT_DELAY);
   return v;
 }