Improving the structure

include/gnss_utils.h

@@ -15,17 +15,24 @@ namespace GNSSUtils
   class Observation
   {
   public:
-
-    obsd_t GetRTKLIBObj();
+    // Constructor
     Observation();
+
+    // Constructor overloaded
+    Observation(int sat, int rcv);
+
+    // Destructor
     ~Observation();
+
+    // Public API
+
   private:
     gtime_t _time;           // Receiver sampling time
-    unsigned char _sat;      // Satellite number
-    unsigned char _rcv;      // Receiver number
-    std::vector<char> _SNR;
-    std::vector<char> _LLI;
-    std::vector<char> _code;
+    int _sat;      // Satellite number
+    int _rcv;      // Receiver number
+    std::vector<int> _SNR;
+    std::vector<int> _LLI;
+    std::vector<int> _code;
     std::vector<double> _L;
     std::vector<double> _P;
     std::vector<double> _D;
@@ -34,12 +41,18 @@ namespace GNSSUtils
   class Receiver
   {
   public:
+    // Constructor & Destructor
     Receiver();
     ~Receiver();
-    std::shared_ptr<double> _obsPtr;
-    void UpdateObservation();
-  private:
 
+    // Public objects
+
+    // Public methods
+    void clearObservations();
+
+    void pushObservation(GNSSUtils::Observation obs);
+  private:
+    std::vector<Observation> _obsVector;
 
   };
 }

src/gnss_utils.cpp

@@ -2,16 +2,29 @@
 
 using namespace GNSSUtils;
 
+// XXX: Separate Classes into different .cpp .h files
+
+// OBSERVATION METHODS
+
 Observation::Observation()
 {
 
 }
 
+Observation::Observation(int sat, int rcv)
+{
+  this->_sat = sat;
+  this->_rcv = rcv;
+}
+
 Observation::~Observation()
 {
 //
 }
 
+
+// RECEIVER METHODS
+
 Receiver::Receiver()
 {
 
@@ -22,7 +35,12 @@ Receiver::~Receiver()
 
 }
 
-void Receiver::UpdateObservation()
+void Receiver::clearObservations()
 {
+  _obsVector.clear();
+}
 
+void Receiver::pushObservation(GNSSUtils::Observation obs)
+{
+  _obsVector.push_back(obs);
 }