Changeset 2058 in ntrip

Timestamp:

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

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncmodel.cpp (modified) (2 diffs)
• bncmodel.h (modified) (1 diff)
• bncpppclient.cpp (modified) (5 diffs)
• bncpppclient.h (modified) (2 diffs)

trunk/BNC/bncmodel.cpp

@@ -42 +42 @@
 
 #include "bncmodel.h"
+#include "bncpppclient.h"
+#include "bancroft.h"
 
 using namespace std;
@@ -55 +57 @@
 }
 
+// Constructor
+////////////////////////////////////////////////////////////////////////////
+bncModel::bncModel() {
+  _xcBanc.ReSize(4);
+}
+
+// Destructor
+////////////////////////////////////////////////////////////////////////////
+bncModel::~bncModel() {
+}
+
+// Bancroft Solution
+////////////////////////////////////////////////////////////////////////////
+t_irc bncModel::cmpBancroft(t_epoData* epoData) {
+
+  const unsigned MINOBS = 4;
+
+  if (epoData->size() < MINOBS) {
+    return failure;
+  }
+
+  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;
+  }
+
+  bancroft(BB, _xcBanc);
+
+  return success;
+}

trunk/BNC/bncmodel.h

@@ -27 +27 @@
 
 #include <QtCore>
+#include <newmat.h>
 
-#include <newmat.h>
+#include "bncconst.h"
+
+class t_epoData;
 
 class bncParam {
  public:
+  enum type {CRD_X, CRD_Y, CRD_Z, TROPO, AMB_L3};
   bncParam();
   ~bncParam();
+  double x0;
+};
 
+class bncModel {
+ public:
+  bncModel();
+  ~bncModel();
+  t_irc cmpBancroft(t_epoData* epoData);
+  const ColumnVector& xcBanc() const {return _xcBanc;}
+  
  private:
+  Matrix       _QQ;
+  ColumnVector _xx;
+  ColumnVector _xcBanc;
 };
 

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);

trunk/BNC/bncpppclient.h

@@ -34 +34 @@
 #include "RTCM/GPSDecoder.h"
 #include "RTCM3/ephemeris.h"
+
+class bncModel;
 
 class t_satData {
@@ -102 +104 @@
   QMap<QString, t_corr*> _corr;
   t_epoData*             _epoData;
+  bncModel*              _model;
 };