Changeset 2058 in ntrip for trunk/BNC/bncpppclient.cpp

Timestamp:

Dec 1, 2009, 11:49:03 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncpppclient.cpp (modified) (5 diffs)

trunk/BNC/bncpppclient.cpp

@@ -46 +46 @@
 #include "bncutils.h"
 #include "bncconst.h"
-#include "bancroft.h"
+#include "bncmodel.h"
 
 extern "C" {
@@ -59 +59 @@
   _staID   = staID;
   _epoData = 0;
+  _model   = new bncModel();
 }
 
@@ -64 +65 @@
 ////////////////////////////////////////////////////////////////////////////
 bncPPPclient::~bncPPPclient() {
+  delete _model;
   delete _epoData;
   QMapIterator<QString, t_eph*> it(_eph);
@@ -288 +290 @@
 void bncPPPclient::processEpoch() {
 
-  const unsigned MINOBS = 4;
-
   // Data Pre-Processing
   // -------------------
@@ -305 +305 @@
   }
 
-  if (_epoData->size() < MINOBS) {
-    return;
-  }
-
   // Bancroft Solution
   // -----------------
-  Matrix BB(_epoData->size(), 4);
-
-  QMapIterator<QString, t_satData*> it(_epoData->satData);
-  int iObs = 0;
-  while (it.hasNext()) {
-    it.next();
-    QString    prn     = it.key();
-    t_satData* satData = it.value();
-    ++iObs;
-    BB(iObs, 1) = satData->xx(1);
-    BB(iObs, 2) = satData->xx(2);
-    BB(iObs, 3) = satData->xx(3);
-    BB(iObs, 4) = satData->P3 + satData->clk;
-  }
-
-  ColumnVector pos(4);
-  bancroft(BB, pos);
+  if (_model->cmpBancroft(_epoData) != success) {
+    return;
+  }
 
   ostringstream str;
   str.setf(ios::fixed);
-  str << "    PPP "
+  str << "    PPP " << _staID.data() << " " 
       << _epoData->tt.timestr(1) << " " << _epoData->size() << " " 
-      << setw(14) << setprecision(3) << pos(1)              << "  "
-      << setw(14) << setprecision(3) << pos(2)              << "  "
-      << setw(14) << setprecision(3) << pos(3);
+      << setw(14) << setprecision(3) << _model->xcBanc()(1) << "  "
+      << setw(14) << setprecision(3) << _model->xcBanc()(2) << "  "
+      << setw(14) << setprecision(3) << _model->xcBanc()(3);
 
   emit newMessage(QString(str.str().c_str()).toAscii(), true);