Diff: Value.hpp

Branch:

Integration

Revision:

39:13e66d087ae9

Parent:

38:9b43b2415093

--- a/Value.hpp	Fri Oct 19 06:32:59 2018 +0000
+++ b/Value.hpp	Fri Oct 19 15:08:35 2018 +0000
@@ -52,6 +52,8 @@
             int16_t     int16_value;
             uint32_t    uint32_value;
             int32_t     int32_value;
+            uint64_t    uint64_value;
+            int64_t     int64_value;
             float       float_value;
             double      double_value;
             uint32_t    time_value;
@@ -140,7 +142,7 @@
   }
 
   void setTripleDoubleValue(double value1, double value2, double value3) {
-    this->_value.type = DOUBLE;
+    this->_value.type = TRIPLE_DOUBLE;
     this->_value.value.triple_double_values[0] = value1;
     this->_value.value.triple_double_values[1] = value2;
     this->_value.value.triple_double_values[2] = value3;
@@ -185,14 +187,6 @@
     return this->_value.value.int32_value;
   }
 
-  uint64_t getUint64Value() {
-    return this->_value.value.uint64_value;
-  }
-
-  int64_t getInt64Value() {
-    return this->_value.value.int64_value;
-  }
-
   float getFloatValue() {
     return this->_value.value.float_value;
   }
@@ -219,10 +213,10 @@
   NB. For boolean Values, true > false.
   NB. For float and double values, equality is somewhat hazardous due to precision.
   */
-  int8_t compareTo(Value & otherValue);
+  int8_t compareTo(misnet::Value & otherValue);
 
 
-  Value substract(Value& otherValue);
+  misnet::Value substract(misnet::Value& otherValue);
 
 
   /* This methode substracts a value from the current one and checks whether the result
@@ -232,13 +226,12 @@
      a terminal is started and there is no "previous value", this method will return true,
      so that the sensor can send its initial value.
   */
-  bool isAbsoluteDifferenceValueGreaterThanDelta(Value& valueToSubstract, Value& delta);
-
+  bool isAbsoluteDifferenceValueGreaterThanDelta(misnet::Value& valueToSubstract, misnet::Value& delta);
 
   /* This method returns a boolean value telling whether or not the current value
      differs from the parameter value.
   */
-  bool isDifferentFrom(Value& otherValue);
+  bool isDifferentFrom(misnet::Value& otherValue);
 
 #ifdef TEST_ENVIRONMENT
   // Used for debugging purpose