Changeset 10805 in ntrip for trunk/BNC

Timestamp:

Feb 2, 2026, 11:13:04 AM (4 days ago)

Author:

stuerze

Message:

minor changes regarding ppp output

Location:

trunk/BNC/src

Files:

• PPP/pppClient.cpp (modified) (2 diffs)
• PPP/pppClient.h (modified) (1 diff)
• PPP/pppFilter.cpp (modified) (2 diffs)
• PPP/pppFilter.h (modified) (2 diffs)
• pppInclude.h (modified) (6 diffs)
• pppModel.cpp (modified) (2 diffs)
• pppModel.h (modified) (2 diffs)
• pppRun.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -307 +307 @@
         LOG << "\nPPP of Epoch ";
         if (!_epoTimeRover.undef()) LOG << string(_epoTimeRover);
+        LOG << " using " << _opt->_corrMount;
         LOG << "\n---------------------------------------------------------------\n";
         LOG << string(epoTime) << " BANCROFT: "
@@ -369 +370 @@
     _output->_trp      = _filter->trp();
     _output->_trpStdev = _filter->trpStdev();
+
+    _output->_fixRatio = _filter->fixRatio();
 
     _output->_numSat   = _filter->numSat();

trunk/BNC/src/PPP/pppClient.h

@@ -18 +18 @@
 class t_pppStation;
 class t_pppFilter;
+class t_tides;
 
 class t_pppClient : public interface_pppClient {

trunk/BNC/src/PPP/pppFilter.cpp

@@ -112 +112 @@
   // ----------------------
   cmpDOP(allObs);
-  
+
   // Ambiguity Resolution
   // --------------------
@@ -120 +120 @@
     ColumnVector    xFix     = _xFlt;
     SymmetricMatrix QFix     = _QFlt;
-    double          fixRatio = 0.0;
-    ambRes.run(_epoTime, _parlist->params(), QFix, xFix, fixRatio, msg);
+    _fixRatio = 0.0;
+    ambRes.run(_epoTime, _parlist->params(), QFix, xFix, _fixRatio, msg);
     LOG << msg.str();
-    _parlist->printResult(_epoTime, QFix, xFix, fixRatio);
+    _parlist->printResult(_epoTime, QFix, xFix, _fixRatio);
   }
 

trunk/BNC/src/PPP/pppFilter.h

@@ -30 +30 @@
   double PDOP() const {return _dop.P;}
   double GDOP() const {return _dop.G;}
+  double fixRatio() const {return _fixRatio;}
   double trp() const {
     const std::vector<t_pppParam*>& par = _parlist->params();
@@ -101 +102 @@
   bncTime         _firstEpoTime;
   bncTime         _lastEpoTimeOK;
+  double          _fixRatio;
 };
 

trunk/BNC/src/pppInclude.h

@@ -16 +16 @@
 
 const double ZEROVALUE = 1e-100;
-  
+
 class t_except {
  public:
@@ -40 +40 @@
   double       _hDop;
   std::string  _log;
+  double       _fixRatio;
   bool         _error;
 };
@@ -48 +49 @@
 
   t_lc() : _type(dummy), _frq1(t_frequency::dummy), _frq2(t_frequency::dummy) {}
-  
+
   t_lc(type tt, t_frequency::type frq1, t_frequency::type frq2 = t_frequency::dummy)
     : _type(tt), _frq1(frq1), _frq2(frq2) {
@@ -83 +84 @@
     }
   }
-  
+
   bool includesPhase() const {
     if (_type == phase || _type == phaseIF || _type == MW || _type == CL) {
@@ -110 +111 @@
     }
   }
-  
+
   bool isGeometryFree() const {
     if (_type == MW || _type == CL || _type == GIM) {
@@ -119 +120 @@
     }
   }
-  
+
   t_frequency::type toFreq() const {
     if (_frq2 != t_frequency::dummy) {

trunk/BNC/src/pppModel.cpp

@@ -559 +559 @@
     ColumnVector sy = crossproduct(sz, xSun);
     ColumnVector sx = crossproduct(sy, sz);
-    
+
     if (useYaw) {
       ColumnVector Omega(3);
@@ -568 +568 @@
       vSatMod /= vSatMod.NormFrobenius();
       //// beg test
-      //// double yawDef = acos( DotProduct(sx, vSatMod));
-      //// cout.setf(ios::fixed);
-      //// cout << string(etime) << ' ' << prn.system() << ' ' << prn.number() << ' '
-      ////      << ' ' << setw(7) << setprecision(3) << yaw    * 180.0 / M_PI
-      ////      << ' ' << setw(7) << setprecision(3) << yawDef * 180.0 / M_PI << endl;
+      double yawDef = acos( DotProduct(sx, vSatMod));
+      LOG.setf(ios::fixed);
+      if (etime.daysec())
+      LOG << "yawAngle " << string(etime) << ' ' << prn.toString()
+            << ' ' << setw(7) << setprecision(3) << yaw    * 180.0 / M_PI
+            << ' ' << setw(7) << setprecision(3) << yawDef * 180.0 / M_PI
+            << endl;
       //// end test
       sy = crossproduct(sz, vSatMod);

trunk/BNC/src/pppModel.h

@@ -5 +5 @@
 #include <newmat.h>
 #include <iostream>
+#include <iomanip>
 #include <string>
 #include "bnctime.h"
@@ -10 +11 @@
 #include "satObs.h"
 #include "bncutils.h"
+#include "pppClient.h"
 
 namespace BNC_PPP {

trunk/BNC/src/pppRun.cpp

@@ -404 +404 @@
             << " TRP: " << showpos << setw(8) << setprecision(4) << output._trp0
             << " "      << showpos << setw(8) << setprecision(4) << output._trp;
+        if (output._fixRatio > 0.0) {
+          log << " fix " <<  int(100*output._fixRatio) << " %";
+        }
+        else {
+          log << " flt ";
+        }
+
       }