Changeset 14310

Timestamp:

08/04/12 11:13:45 (12 years ago)

Author:

tbretz

Message:

Fixed a problem with the visibility and current-predition if sources have their maximum at the same time.

File:

• trunk/FACT++/src/smartfact.cc (modified) (5 diffs)

trunk/FACT++/src/smartfact.cc

@@ -1971 +1971 @@
             return make_pair(vector<float>(), make_pair(Time(), 0));
 
-        return make_pair(vec, make_pair(maxjd, maxjd>jd+jd0&&maxjd<jd+jd1?max:0));
+        return make_pair(vec, make_pair(maxjd, maxjd>jd+jd0&&maxjd<jd+jd1?max:-1));
     }
 #endif
@@ -2041 +2041 @@
         out4 << now.JavaDate() << '\n';
 
-        map<Time, pair<string, float>> culmination;
-        map<Time, pair<string, float>> lightcond;
+        multimap<Time, pair<string, float>> culmination;
+        multimap<Time, pair<string, float>> lightcond;
         vector<vector<float>> alt;
         vector<vector<float>> cur;
@@ -2055 +2055 @@
         {
             alt.push_back(vism.first);
-            culmination[vism.second.first] = make_pair("Moon", vism.second.second);
+            culmination.insert(make_pair(vism.second.first, make_pair("Moon", vism.second.second)));
         }
 #endif
@@ -2087 +2087 @@
                 {
                     alt.push_back(vis.first);
-                    culmination[vis.second.first] = make_pair(name, vis.second.second);
+                    culmination.insert(make_pair(vis.second.first, make_pair(name, vis.second.second)));
 
                     const pair<vector<float>, pair<Time, float>> lc = GetLightCondition(&pos, &observer, now.JD());
@@ -2093 +2093 @@
                     {
                         cur.push_back(lc.first);
-                        lightcond[lc.second.first] = make_pair(name, lc.second.second);
+                        lightcond.insert(make_pair(lc.second.first, make_pair(name, lc.second.second)));
                     }
                 }
-
-                //out3 << vis.second.first << "/" << vis.second.second << " ";
 
                 string col = HTML::kWhite;