Changeset 2246 in ntrip

Timestamp:

Jan 12, 2010, 5:22:33 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncmodel.cpp (modified) (2 diffs)

trunk/BNC/bncmodel.cpp

@@ -103 +103 @@
   // ---------------
   else if (type == RECCLK_GPS) {
-    return 1.0;
+    if (satData->prn[0] == 'G') {
+      return 1.0;
+    }
+    else {
+      return 0.0;
+    }
   }
   else if (type == RECCLK_GLO) {
@@ -662 +667 @@
     vv    = ll - AA * dx;
 
-//    //// beg test
-//    {
-//      cout.setf(ios::fixed);
-//      ColumnVector vv_code(epoData->sizeGPS());
-//      ColumnVector vv_phase(epoData->sizeGPS());
-//      ColumnVector vv_glo(epoData->sizeGlo());
-//
-//      for (int iobs = 1; iobs <= epoData->sizeGPS(); ++iobs) {
-//        vv_code(iobs)  = vv(2*iobs-1);
-//        vv_phase(iobs) = vv(2*iobs);
-//      }
-//      for (int iobs = 1; iobs <= epoData->sizeGlo(); ++iobs) {
-//        vv_glo(iobs)  = vv(2*epoData->sizeGPS()+iobs);
-//      }
-//
-//      cout << "residuals code  " << setprecision(3) << vv_code.t(); 
-//      cout << "residuals phase " << setprecision(3) << vv_phase.t();
-//      cout << "residuals glo   " << setprecision(3) << vv_glo.t();
-//    }
-//    //// end test
+    //// beg test
+    {
+      cout.setf(ios::fixed);
+      ColumnVector vv_code(epoData->sizeGPS());
+      ColumnVector vv_phase(epoData->sizeGPS());
+      ColumnVector vv_glo(epoData->sizeGlo());
+
+      for (unsigned iobs = 1; iobs <= epoData->sizeGPS(); ++iobs) {
+        vv_code(iobs)  = vv(2*iobs-1);
+        vv_phase(iobs) = vv(2*iobs);
+      }
+      for (unsigned iobs = 1; iobs <= epoData->sizeGlo(); ++iobs) {
+        vv_glo(iobs)  = vv(2*epoData->sizeGPS()+iobs);
+      }
+
+      cout << "residuals code  " << setprecision(3) << vv_code.t(); 
+      cout << "residuals phase " << setprecision(3) << vv_phase.t();
+      cout << "residuals glo   " << setprecision(3) << vv_glo.t();
+    }
+    //// end test
 
   } while (outlierDetection(QQsav, vv, epoData->satDataGPS,