calendar event iterator bug

frePPLe · Nov 16, 2018 · a172646 · a172646
1 parent 439e690
commit a172646
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/include/frepple/model.h b/include/frepple/model.h
@@ -484,13 +484,14 @@ class Calendar : public HasName<Calendar>, public HasSource
         Calendar* theCalendar = nullptr;
         Date curDate;
         double curValue = 0.0;
+        double prevValue = 0.0;
       public:
         const Date& getDate() const
         { 
           return curDate;
         }
 
-        double getValue()
+        double getValue() const
         {
           return curValue;
         }
@@ -500,6 +501,11 @@ class Calendar : public HasName<Calendar>, public HasSource
           return theCalendar;
         }
 
+        double getPrevValue() const
+        {
+          return prevValue;
+        }
+
         EventIterator(
           Calendar* c = nullptr,Date d = Date::infinitePast, bool forward = true
           );

diff --git a/src/model/calendar.cpp b/src/model/calendar.cpp
@@ -532,7 +532,7 @@ Calendar::EventIterator::EventIterator
     if (cacheiter == theCalendar->eventlist.end())
       curValue = theCalendar->getDefault();
     else
-      curValue = cacheiter->second;
+      curValue = cacheiter->second;    
   }
   else
   {
@@ -544,6 +544,7 @@ Calendar::EventIterator::EventIterator
     else
       curValue = cacheiter->second;
   }
+  prevValue = curValue;
 }
 
 
@@ -564,6 +565,7 @@ Calendar::EventIterator& Calendar::EventIterator::operator++()
       }
     }
   }
+  prevValue = curValue;
   if (cacheiter == theCalendar->eventlist.end())
   {
     curDate = Date::infiniteFuture;
@@ -580,6 +582,7 @@ Calendar::EventIterator& Calendar::EventIterator::operator++()
 
 Calendar::EventIterator& Calendar::EventIterator::operator--()
 {
+  prevValue = curValue;
   if (cacheiter == theCalendar->eventlist.end())
   {
     curValue = theCalendar->getDefault();

diff --git a/src/model/operation.cpp b/src/model/operation.cpp
@@ -256,27 +256,35 @@ DateRange Operation::calculateOperationTime(
   bool status = false;
   Duration curduration = duration;
   while (true)
-  {
-    // Check whether all calendars are available
-    bool available = true;
+  {    
+    // Find the closest event date
     Date selected = forward ? Date::infiniteFuture : Date::infinitePast;
     for (auto t = cals.begin(); t != cals.end(); ++t)
     {
       if (
         (forward && t->getDate() < selected)
         || (!forward && t->getDate() > selected)
         )
-      {
         selected = t->getDate();
-        if (forward && available && t->getValue() == 0)
+    }
+
+    // Check whether all calendars are available at the next event date
+    bool available = true;
+    if (forward)
+    {
+      for (auto t = cals.begin(); t != cals.end() && available; ++t)
+      {     
+        if (t->getDate() == selected && t->getValue() == 0)
+          available = false;
+        else if (t->getDate() != selected && t->getPrevValue() == 0)
           available = false;
       }
     }
-    if (!forward)
+    else
     {
-      for (auto t = cals.begin(); t != cals.end(); ++t)
+      for (auto t = cals.begin(); t != cals.end() && available; ++t)
       {
-        if (available && t->getCalendar()->getValue(selected, forward) == 0)
+        if (t->getCalendar()->getValue(selected, forward) == 0)
           available = false;
       }
     }
@@ -390,7 +398,6 @@ DateRange Operation::calculateOperationTime(
           --(*t);
     }
   }
-
   return result;
 }