Changeset 5917 in ntrip for trunk

Timestamp:

Aug 12, 2014, 5:11:50 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/PPP/pppParlist.cpp (modified) (2 diffs)

trunk/BNC/src/PPP/pppParlist.cpp

@@ -212 +212 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_pppParlist::set(const bncTime& epoTime, const vector<t_lc::type>& ambLCs, 
-                     const vector<t_pppSatObs*>& obsVector) {
+t_irc t_pppParlist::set(const bncTime& epoTime, const std::vector<t_pppSatObs*>& obsVector) {
 
   // Remove some Parameters
@@ -294 +293 @@
   // Ambiguities
   // -----------
-  for (unsigned ii = 0; ii < ambLCs.size(); ii++) {
-    const t_lc::type& tLC = ambLCs[ii];
-    for (unsigned jj = 0; jj < obsVector.size(); jj++) {
-      const t_pppSatObs* satObs = obsVector[jj];
-      required.push_back(new t_pppParam(t_pppParam::amb, satObs->prn(), tLC, &obsVector));
+  for (unsigned jj = 0; jj < obsVector.size(); jj++) {
+    const t_pppSatObs*        satObs = obsVector[jj];
+    const vector<t_lc::type>& ambLCs = OPT->ambLCs(satObs->prn().system());
+    for (unsigned ii = 0; ii < ambLCs.size(); ii++) {
+      required.push_back(new t_pppParam(t_pppParam::amb, satObs->prn(), ambLCs[ii], &obsVector));
     }
   }