Changeset 6017 in ntrip for trunk/BNC/src/PPP/pppSatObs.h

Timestamp:

Aug 21, 2014, 8:44:50 AM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/PPP/pppSatObs.h (modified) (5 diffs)

trunk/BNC/src/PPP/pppSatObs.h

@@ -16 +16 @@
   t_pppSatObs(const t_satObs& satObs);
   ~t_pppSatObs();
-  bool                isValid() const {return _valid;}
-  void                prepareObs();
   const t_prn&        prn() const {return _prn;}
   const ColumnVector& xc() const {return _xcSat;}
@@ -42 +40 @@
 
   bool slip() const {
-    for (unsigned ii = 0; ii < _allObs.size(); ii++) {
-      if (_allObs[ii]->_slip) {
+    for (unsigned ii = 1; ii < t_frequency::max; ii++) {
+      if (_obs[ii] && _obs[ii]->_slip) {
         return true;
       }
@@ -52 +50 @@
   int slipCounter() const {
     int cnt = -1;
-    for (unsigned ii = 0; ii < _allObs.size(); ii++) {
-      if (_allObs[ii]->_slipCounter > cnt) {
-        cnt = _allObs[ii]->_slipCounter;
+    for (unsigned ii = 1; ii < t_frequency::max; ii++) {
+      if (_obs[ii] && _obs[ii]->_slipCounter > cnt) {
+        cnt = _obs[ii]->_slipCounter;
       }
     }
@@ -62 +60 @@
   int biasJumpCounter() const {
     int jmp = -1;
-    for (unsigned ii = 0; ii < _allObs.size(); ii++) {
-      if (_allObs[ii]->_biasJumpCounter > jmp) {
-        jmp = _allObs[ii]->_biasJumpCounter;
+    for (unsigned ii = 1; ii < t_frequency::max; ii++) {
+      if (_obs[ii] && _obs[ii]->_biasJumpCounter > jmp) {
+        jmp = _obs[ii]->_biasJumpCounter;
       }
     }
@@ -113 +111 @@
   };
 
+  void prepareObs(const t_satObs& satObs);
+
   t_prn                        _prn;
   bncTime                      _time;
   int                          _channel;
-  std::vector<t_frqObs*>       _allObs;
-  bool                         _valid;
-  t_frqObs*                    _validObs1;
-  t_frqObs*                    _validObs2;
-  double                       _f1;
-  double                       _f2;
-  double                       _rawC1;
-  double                       _rawC2;
-  double                       _rawL1;
-  double                       _rawL2;
+  t_frqObs*                    _obs[t_frequency::max];
   ColumnVector                 _xcSat;
   ColumnVector                 _vvSat;