Changeset 8901 in ntrip for trunk/BNC/src

Timestamp:

Mar 18, 2020, 11:06:13 AM (5 years ago)

Author:

stuerze

Message:

upgrade to newmat11 library

Location:

trunk/BNC/src

Files:

• PPP_SSR_I/pppFilter.cpp (modified) (5 diffs)
• combination/bnccomb.cpp (modified) (2 diffs)
• rinex/reqcanalyze.cpp (modified) (1 diff)

trunk/BNC/src/PPP_SSR_I/pppFilter.cpp

@@ -332 +332 @@
   xRec(3) = z();
 
-  double rho0 = (satData->xx - xRec).norm_Frobenius();
+  double rho0 = (satData->xx - xRec).NormFrobenius();
   double dPhi = t_CST::omega * rho0 / t_CST::c;
 
@@ -341 +341 @@
   xRec += _tides->displacement(_time, xRec);
 
-  satData->rho = (satData->xx - xRec).norm_Frobenius();
+  satData->rho = (satData->xx - xRec).NormFrobenius();
 
   double tropDelay = delay_saast(satData->eleSat) +
@@ -796 +796 @@
     // --------------------------------------
     ColumnVector rho = rRec - rSat;
-    rho /= rho.norm_Frobenius();
+    rho /= rho.NormFrobenius();
 
     // GPS Satellite unit Vectors sz, sy, sx
     // -------------------------------------
-    ColumnVector sz = -rSat / rSat.norm_Frobenius();
+    ColumnVector sz = -rSat / rSat.NormFrobenius();
 
     ColumnVector xSun = t_astro::Sun(Mjd);
-    xSun /= xSun.norm_Frobenius();
+    xSun /= xSun.NormFrobenius();
 
     ColumnVector sy = crossproduct(sz, xSun);
@@ -839 +839 @@
     // ----------------
     double alpha = DotProduct(dipSat,dipRec) /
-                      (dipSat.norm_Frobenius() * dipRec.norm_Frobenius());
+                      (dipSat.NormFrobenius() * dipRec.NormFrobenius());
 
     if (alpha >  1.0) alpha =  1.0;
@@ -861 +861 @@
   Tracer tracer("t_pppFilter::cmpEle");
   ColumnVector rr = satData->xx - _xcBanc.Rows(1,3);
-  double       rho = rr.norm_Frobenius();
+  double       rho = rr.NormFrobenius();
 
   double neu[3];

trunk/BNC/src/combination/bnccomb.cpp

@@ -1141 +1141 @@
       }
       else {
-        double normMax = maxDiff[prn]->_diffRao.norm_Frobenius();
-        double norm    = corr->_diffRao.norm_Frobenius();
+        double normMax = maxDiff[prn]->_diffRao.NormFrobenius();
+        double norm    = corr->_diffRao.NormFrobenius();
         if (norm > normMax) {
           maxDiff[prn] = corr;
@@ -1165 +1165 @@
       }
       else if (corr == maxDiff[prn]) {
-        double norm = corr->_diffRao.norm_Frobenius();
+        double norm = corr->_diffRao.NormFrobenius();
         if (norm > MAX_DISPLACEMENT) {
           out << _resTime.datestr().c_str()    << " "

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -278 +278 @@
         ++nSatUsed;
         ColumnVector dx = xSat.Rows(1,3) - xyzSta;
-        double rho = dx.norm_Frobenius();
+        double rho = dx.NormFrobenius();
         AA(nSatUsed,1) = dx(1) / rho;
         AA(nSatUsed,2) = dx(2) / rho;