Changeset 2061 in ntrip

Timestamp:

Dec 1, 2009, 1:27:38 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

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

trunk/BNC/bncmodel.cpp

@@ -157 +157 @@
   double tropDelay = 0.0;
 
-  return satData->rho + _xcBanc(4) + tropDelay;
+  return satData->rho + _xcBanc(4) - satData->clk + tropDelay;
 }
 
@@ -166 +166 @@
   unsigned nPar = _params.size();
   unsigned nObs = epoData->size();
-
-  cout << "update " << nPar << " " << nObs << endl;
 
   _AA.ReSize(nObs, nPar);  // variance-covariance matrix
@@ -179 +177 @@
     QString    prn     = itObs.key();
     t_satData* satData = itObs.value();
-    _ll(iObs) = cmpValueP3(satData);
+    _ll(iObs) = satData->P3 - cmpValueP3(satData);
 
     unsigned iPar = 0;
@@ -190 +188 @@
   }
 
-  cout << _AA << endl;
-  cout.flush();
-
   _QQ.ReSize(nPar);
   _QQ << _AA.t() * _AA;

trunk/BNC/bncpppclient.cpp

@@ -319 +319 @@
   ostringstream str;
   str.setf(ios::fixed);
-  str << "    PPP " << _staID.data() << " " 
+  str << "    BANC " << _staID.data() << " " 
       << _epoData->tt.timestr(1) << " " << _epoData->size() << " " 
       << setw(14) << setprecision(3) << _model->xcBanc()(1) << "  "
       << setw(14) << setprecision(3) << _model->xcBanc()(2) << "  "
-      << setw(14) << setprecision(3) << _model->xcBanc()(3);
+      << setw(14) << setprecision(3) << _model->xcBanc()(3) << endl;
+
+  str << "    PPP " << _staID.data() << " " 
+      << _epoData->tt.timestr(1) << " " << _epoData->size() << " " 
+      << setw(14) << setprecision(3) << _model->xx()(1) << "  "
+      << setw(14) << setprecision(3) << _model->xx()(2) << "  "
+      << setw(14) << setprecision(3) << _model->xx()(3);
 
   emit newMessage(QString(str.str().c_str()).toAscii(), true);