Changeset 2233 in ntrip

Timestamp:

Jan 12, 2010, 11:46:32 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncmodel.cpp (modified) (7 diffs)
• bncpppclient.cpp (modified) (1 diff)

trunk/BNC/bncmodel.cpp

@@ -377 +377 @@
     while (iGPS.hasNext()) {
       iGPS.next();
-      QString prn   = iGPS.key();
+      QString prn        = iGPS.key();
+      t_satData* satData = iGPS.value();
       bool    found = false;
       for (int iPar = 1; iPar <= _params.size(); iPar++) {
@@ -395 +396 @@
     while (iGlo.hasNext()) {
       iGlo.next();
-      QString prn   = iGlo.key();
+      QString prn        = iGlo.key();
+      t_satData* satData = iGlo.value();
       bool    found = false;
       for (int iPar = 1; iPar <= _params.size(); iPar++) {
@@ -407 +409 @@
         bncParam* par = new bncParam(bncParam::AMB_L3, _params.size()+1, prn);
         _params.push_back(par);
+        par->xx = satData->P3 - cmpValue(satData);
       }
     }
@@ -507 +510 @@
     unsigned nObs = 0;
     if (_usePhase) {
-      nObs = 2 * epoData->sizeGPS() + epoData->sizeGlo();
+      nObs = 2 * epoData->sizeGPS(); // TODO: + epoData->sizeGlo();
     }
     else {
@@ -562 +565 @@
       QMapIterator<QString, t_satData*> itGlo(epoData->satDataGlo);
       while (itGlo.hasNext()) {
-        ++iObs;
+        //// TODO        ++iObs;
         itGlo.next();
         QString    prn     = itGlo.key();
         t_satData* satData = itGlo.value();
       
+        //// beg test
         double rhoCmp = cmpValue(satData);
-
-        //// beg test
-        cout << prn.toAscii().data() << " "  << rhoCmp << " "
-             << satData->P3 << " " << satData->L3 << endl;
+        cout.setf(ios::fixed);
+        cout << prn.toAscii().data() << " "  
+             << setprecision(3) << rhoCmp      << " "
+             << setprecision(3) << satData->P3 << " "
+             << setprecision(3) << satData->L3 << " " << endl;
+
         //// end test
-      
-        double ellWgtCoeff = 1.0;
-        ////  double eleD = satData->eleSat * 180.0 / M_PI;
-        ////  if (eleD < 25.0) {
-        ////    ellWgtCoeff = 2.5 - (eleD - 10.0) * 0.1;
-        ////    ellWgtCoeff *= ellWgtCoeff;
-        ////  }
-      
-        ll(iObs)      = satData->L3 - rhoCmp;
-        PP(iObs,iObs) = 1.0 / (sig_L3 * sig_L3) / ellWgtCoeff;
-        for (int iPar = 1; iPar <= _params.size(); iPar++) {
-          if (_params[iPar-1]->type == bncParam::AMB_L3 &&
-              _params[iPar-1]->prn  == prn) {
-            ll(iObs) -= _params[iPar-1]->xx;
-          } 
-          AA(iObs, iPar) = _params[iPar-1]->partial(satData, prn);
-        }
       }
     }
@@ -605 +594 @@
 
   } while (outlierDetection(QQsav, vv, epoData->satDataGPS, 
-                                       epoData->satDataGlo) != 0);
+                            epoData->satDataGlo) != 0);
 
   // Set Solution Vector
@@ -736 +725 @@
   }
  
-  // Glonass phase residuals
-  // -----------------------
-  if (_usePhase) {
-    QMutableMapIterator<QString, t_satData*> itGlo(satDataGlo);
-    while (itGlo.hasNext()) {
-      itGlo.next();
-      ++ii;
-      if (vvMaxPhaseGlo == 0.0 || fabs(vv(ii)) > vvMaxPhaseGlo) {
-        vvMaxPhaseGlo = fabs(vv(ii));
-        itMaxPhaseGlo = itGlo;
-      }
-    }
-  }
+////  // Glonass phase residuals
+////  // -----------------------
+////  if (_usePhase) {
+////    QMutableMapIterator<QString, t_satData*> itGlo(satDataGlo);
+////    while (itGlo.hasNext()) {
+////      itGlo.next();
+////      ++ii;
+////      if (vvMaxPhaseGlo == 0.0 || fabs(vv(ii)) > vvMaxPhaseGlo) {
+////        vvMaxPhaseGlo = fabs(vv(ii));
+////        itMaxPhaseGlo = itGlo;
+////      }
+////    }
+////  }
 
   if      (vvMaxCodeGPS > MAXRES_CODE) {

trunk/BNC/bncpppclient.cpp

@@ -187 +187 @@
     _epoData->satDataGlo[prn] = satData;
   }
+
 }