[Positioning] Request: timestamp -> time_sent

owlps-positioning/TODO

@@ -30,12 +30,11 @@
    Attributs Viterbi ? (Cf. l'ancien clientinfo.hh.)
 
 - Renommages de membres
-   ° Request : timestamp −> date_sent
    ° InputMedium :
    °° current_line_nb et get_current_line_nb()
    °° get_next_request() −> read_next_request()
    ° Input : get_next_request() −> read_next_request()
-   ° Area : p_min et p_max ?
+   ° Area : p_min et p_max −> coord_min et coord_max
 
 - Doxygen
    ° Pourquoi une description détaillée placée dans un .cc ne s'affiche

owlps-positioning/src/inputcsv.cc

@@ -150,7 +150,7 @@ const Request& InputCSV::get_next_request()
     }
   try
     {
-      current_request->set_timestamp(Timestamp
+      current_request->set_time_sent(Timestamp
                                      (lexical_cast<uint64_t>(*ti))) ;
     }
   catch (bad_lexical_cast &e)

owlps-positioning/src/inputlogcsv.cc

@@ -57,7 +57,7 @@ const string InputLogCSV::request_to_csv(const Request &request) const
   ostringstream csv_line ;
   if (request.get_mobile() != NULL)
     csv_line << request.get_mobile()->get_mac_addr() ;
-  csv_line << ';' << request.get_timestamp() << ';' ;
+  csv_line << ';' << request.get_time_sent() << ';' ;
 
   const CalibrationRequest *calibration_request =
     dynamic_cast<const CalibrationRequest*>(&request) ;

owlps-positioning/src/request.cc

@@ -25,13 +25,13 @@ Request::~Request()
 /// Reinitialises all attributes
 /**
  * - #mobile is NULLified, but the value it pointed to is not deleted.
- * - The fields of #timestamp are initialised to 0.
+ * - The fields of #time_sent are initialised to 0.
  * - #measurements is cleared.
  */
 void Request::clear()
 {
   mobile = NULL ;
-  timestamp.clear() ;
+  time_sent.clear() ;
   measurements.clear() ;
 }
 
@@ -46,22 +46,22 @@ const Request& Request::operator=(const Request &source)
     return *this ;
 
   mobile = source.mobile ;
-  timestamp = source.timestamp ;
+  time_sent = source.time_sent ;
   measurements = source.measurements ;
 
   return *this ;
 }
 
 
-bool Request::operator==(const Request &comp) const
+bool Request::operator==(const Request &source) const
 {
-  if (this == &comp)
+  if (this == &source)
     return true ;
 
   return
-    mobile == comp.mobile &&
-    timestamp == comp.timestamp &&
-    measurements == comp.measurements ;
+    mobile == source.mobile &&
+    time_sent == source.time_sent &&
+    measurements == source.measurements ;
 }
 
 
@@ -70,7 +70,7 @@ ostream& operator<<(ostream &os, const Request &r)
 {
   // Timestamp
   os
-      << "At " << r.timestamp << "; " ;
+      << "At " << r.time_sent << "; " ;
 
   // MAC address
   os

owlps-positioning/src/request.hh

@@ -17,7 +17,7 @@ protected:
   /// The mobile that sent the request
   Mobile *mobile ;
   /// Local date of the request on the mobile
-  Timestamp timestamp ;
+  Timestamp time_sent ;
   /// List of Measurement of the request
   /** Note that this is not a pointer list, values are actually stored.
       The \em string parameter is the MAC address of the AP. */
@@ -25,26 +25,26 @@ protected:
 
 public:
   Request(const Mobile *_mobile = NULL,
-          const Timestamp &_timestamp = Timestamp(),
+          const Timestamp &_time_sent = Timestamp(),
           const std::tr1::unordered_map<std::string, Measurement>
           &_measurements =
             std::tr1::unordered_map<std::string, Measurement>()):
-    mobile(const_cast<Mobile*>(_mobile)), timestamp(_timestamp),
+    mobile(const_cast<Mobile*>(_mobile)), time_sent(_time_sent),
     measurements(_measurements) {}
 
   Request(const std::tr1::unordered_map<std::string, Measurement>
           &_measurements):
     mobile(NULL), measurements(_measurements) {}
 
-  Request(const Timestamp &_timestamp,
+  Request(const Timestamp &_time_sent,
           const std::tr1::unordered_map<std::string, Measurement>
           &_measurements =
             std::tr1::unordered_map<std::string, Measurement>()):
-    mobile(NULL), timestamp(_timestamp),
+    mobile(NULL), time_sent(_time_sent),
     measurements(_measurements) {}
 
   Request(const Request &source):
-    mobile(source.mobile), timestamp(source.timestamp),
+    mobile(source.mobile), time_sent(source.time_sent),
     measurements(source.measurements) {}
 
   virtual ~Request(void) ;
@@ -52,7 +52,7 @@ public:
   /** @name Read accessors */
   //@{
   Mobile* get_mobile(void) const ;
-  const Timestamp& get_timestamp(void) const ;
+  const Timestamp& get_time_sent(void) const ;
   const std::tr1::unordered_map<std::string, Measurement>&
   get_measurements(void) const ;
   //@}
@@ -60,7 +60,7 @@ public:
   /** @name Write accessors */
   //@{
   void set_mobile(const Mobile *_mobile) ;
-  void set_timestamp(const Timestamp &_timestamp) ;
+  void set_time_sent(const Timestamp &_time_sent) ;
   void set_measurements(const std::tr1::unordered_map
                         <std::string, Measurement> &_measurements) ;
   void clear(void) ;
@@ -89,9 +89,9 @@ inline Mobile* Request::get_mobile() const
 }
 
 
-inline const Timestamp& Request::get_timestamp() const
+inline const Timestamp& Request::get_time_sent() const
 {
-  return timestamp ;
+  return time_sent ;
 }
 
 
@@ -112,9 +112,9 @@ inline void Request::set_mobile(const Mobile *_mobile)
 }
 
 
-inline void Request::set_timestamp(const Timestamp &_timestamp)
+inline void Request::set_time_sent(const Timestamp &_time_sent)
 {
-  timestamp = _timestamp ;
+  time_sent = _time_sent ;
 }
 
 
@@ -143,7 +143,7 @@ inline Request::operator bool() const
 {
   return
     mobile != NULL ||
-    timestamp ||
+    time_sent ||
     measurements.size() > 0 ;
 }
 

owlps-positioning/tests/calibrationrequest_test.hh

@@ -43,7 +43,7 @@ public:
     ReferencePoint referencepoint1(1,2,3) ;
     CalibrationRequest calibrationrequest1(request1, &referencepoint1) ;
     TS_ASSERT_EQUALS(calibrationrequest1.get_mobile(), &mobile1) ;
-    TS_ASSERT_EQUALS(calibrationrequest1.get_timestamp(), timestamp1) ;
+    TS_ASSERT_EQUALS(calibrationrequest1.get_time_sent(), timestamp1) ;
     TS_ASSERT_EQUALS(calibrationrequest1.get_reference_point(),
                      &referencepoint1) ;
 
@@ -53,8 +53,8 @@ public:
     TS_ASSERT_EQUALS(calibrationrequest1.get_mobile(), &mobile2) ;
 
     timestamp1 = 42 ;
-    calibrationrequest1.set_timestamp(timestamp1) ;
-    TS_ASSERT_EQUALS(calibrationrequest1.get_timestamp(), timestamp1) ;
+    calibrationrequest1.set_time_sent(timestamp1) ;
+    TS_ASSERT_EQUALS(calibrationrequest1.get_time_sent(), timestamp1) ;
 
     ReferencePoint referencepoint2(4,3,2) ;
     calibrationrequest1.set_reference_point(&referencepoint2) ;

owlps-positioning/tests/inputcsv_test.hh

@@ -67,8 +67,8 @@ public:
     request1 = inputcsv1.get_next_request() ;
     TS_ASSERT_EQUALS(request1.get_mobile()->get_mac_addr(),
                      TestUtil::mobiles[0].get_mac_addr()) ;
-    TS_ASSERT_EQUALS(request1.get_timestamp(),
-                     TestUtil::requests.at(0)->get_timestamp()) ;
+    TS_ASSERT_EQUALS(request1.get_time_sent(),
+                     TestUtil::requests.at(0)->get_time_sent()) ;
 
     for (std::vector<AccessPoint>::const_iterator i = TestUtil::aps.begin() ;
          i != TestUtil::aps.end() ; ++i)
@@ -90,8 +90,8 @@ public:
     request1 = inputcsv1.get_next_request() ;
     TS_ASSERT_EQUALS(request1.get_mobile()->get_mac_addr(),
                      TestUtil::mobiles[1].get_mac_addr()) ;
-    TS_ASSERT_EQUALS(request1.get_timestamp(),
-                     TestUtil::requests.at(1)->get_timestamp()) ;
+    TS_ASSERT_EQUALS(request1.get_time_sent(),
+                     TestUtil::requests.at(1)->get_time_sent()) ;
 
     for (std::vector<AccessPoint>::const_iterator i = TestUtil::aps.begin() ;
          i != TestUtil::aps.end() ; ++i)
@@ -113,8 +113,8 @@ public:
     request1 = inputcsv1.get_next_request() ;
     TS_ASSERT_EQUALS(request1.get_mobile()->get_mac_addr(),
                      TestUtil::mobiles[0].get_mac_addr()) ;
-    TS_ASSERT_EQUALS(request1.get_timestamp(),
-                     TestUtil::requests.at(2)->get_timestamp()) ;
+    TS_ASSERT_EQUALS(request1.get_time_sent(),
+                     TestUtil::requests.at(2)->get_time_sent()) ;
 
     for (std::vector<AccessPoint>::const_iterator i = TestUtil::aps.begin() ;
          i != TestUtil::aps.end() ; ++i)

owlps-positioning/tests/request_test.hh

@@ -39,7 +39,7 @@ public:
     Mobile mob1 ;
     Request r1(&mob1, current_time, measurements) ;
     TS_ASSERT_EQUALS(r1.get_mobile(), &mob1) ;
-    TS_ASSERT_EQUALS(r1.get_timestamp(), current_time) ;
+    TS_ASSERT_EQUALS(r1.get_time_sent(), current_time) ;
     TS_ASSERT_EQUALS(r1.get_measurements(), measurements) ;
 
     // Write & read accessors
@@ -48,8 +48,8 @@ public:
     TS_ASSERT_EQUALS(r1.get_mobile(), &mob2) ;
 
     current_time = static_cast<uint64_t>(current_time) + 10 ;
-    r1.set_timestamp(current_time) ;
-    TS_ASSERT_EQUALS(r1.get_timestamp(), current_time) ;
+    r1.set_time_sent(current_time) ;
+    TS_ASSERT_EQUALS(r1.get_time_sent(), current_time) ;
 
     AccessPoint ap2(Point3D(3,2,1), "192.168.0.2", "aa:bb:cc:dd:ee:02") ;
     Measurement meas2(&ap2) ;

owlps-positioning/tests/testutil.cc

@@ -161,7 +161,7 @@ create_test_csv_file(const string &file_name, bool with_spaces)
   if (with_spaces)
     line << "\n   \n     " ;
   line << mobiles[0].get_mac_addr() ;
-  line << ';' << requests.at(0)->get_timestamp() ;
+  line << ';' << requests.at(0)->get_time_sent() ;
   line << ";0;0;0;0;" ;
   line << aps[0].get_mac_addr() ;
   line << ';' << requests.at(0)->get_measurements()
@@ -186,7 +186,7 @@ create_test_csv_file(const string &file_name, bool with_spaces)
   CalibrationRequest *calibration_request =
     dynamic_cast<CalibrationRequest*>(requests.at(1)) ;
   assert(calibration_request) ;
-  line << ';' << calibration_request->get_timestamp() ;
+  line << ';' << calibration_request->get_time_sent() ;
   line << ';' << reference_points.at(0).get_x() ;
   line << ';' << reference_points.at(0).get_y() ;
   line << ';' << reference_points.at(0).get_z() ;
@@ -218,7 +218,7 @@ create_test_csv_file(const string &file_name, bool with_spaces)
   if (with_spaces)
     line << '\t' ;
   line << mobiles[0].get_mac_addr() ;
-  line << ';' << requests.at(2)->get_timestamp() ;
+  line << ';' << requests.at(2)->get_time_sent() ;
   line << ";0;0;0;0;" ;
   line << aps[2].get_mac_addr() ;
   line << ';' << requests.at(2)->get_measurements()
@@ -255,7 +255,7 @@ bool TestUtil::request_equals(const Request &first,
     return true ;
 
   // Compare timestamp
-  if (first.get_timestamp() != second.get_timestamp())
+  if (first.get_time_sent() != second.get_time_sent())
     return false ;
 
   // Compare mobile values