Changeset 3409 in ntrip for trunk/BNC

Timestamp:

Sep 2, 2011, 8:48:16 PM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncmodel.cpp (modified) (4 diffs)

trunk/BNC/bncmodel.cpp

@@ -59 +59 @@
 const double   MINELE                = 10.0 * M_PI / 180.0;
 const double   MAXRES_CODE           = 10.0;
-const double   MAXRES_PHASE          = 0.02;
+const double   MAXRES_PHASE          = 0.04;
 const double   GLONASS_WEIGHT_FACTOR = 5.0;
 
@@ -1224 +1224 @@
   // Try with all satellites, then with all minus one, etc.
   // ------------------------------------------------------
-  const unsigned MAX_NEGLECT = 1;
-  for (unsigned nNeglected = 0; nNeglected <= MAX_NEGLECT; nNeglected++) {
+  for (unsigned nNeglected = 0; nNeglected <= allPrns.size() - MINOBS; nNeglected++) {
     usedPrns = allPrns;
 
@@ -1242 +1241 @@
       // Remove Neglected Satellites from epoData
       // ----------------------------------------
+      unsigned neglectedGPS = 0;
       for (unsigned ip = 0; ip < allPrns.size(); ip++) {
         QString prn = allPrns[ip];
@@ -1247 +1247 @@
           epoData->satData.remove(prn);
           strNeglected += prn + " ";
-        }
+          if (prn[0] == 'G') {
+            ++neglectedGPS;
+          }
+        }
+      }
+      if (neglectedGPS > 1) {
+        continue;
       }
       if (epoData->sizeSys('G') < MINOBS) {