PyAlgoEngine 0.3.12.post3__tar.gz → 0.3.12.post4__tar.gz

{PyAlgoEngine-0.3.12.post3 → PyAlgoEngine-0.3.12.post4}/AlgoEngine/Engine/MarketEngine.py

@@ -986,21 +986,17 @@ class ProgressiveReplay(Replay):
 
     def reset(self):
         if self.calendar is None:
-            md = self.start_date
-            self.replay_calendar.clear()
-
-            while md <= self.end_date:
-                self.replay_calendar.append(md)
-                md += datetime.timedelta(days=1)
-
-        elif callable(self.calendar):
-            self.replay_calendar = self.calendar(start_date=self.start_date, end_date=self.end_date)
+            self.replay_calendar = [self.start_date + datetime.timedelta(days=i) for i in range((self.end_date - self.start_date).days + 1)]
         else:
             self.replay_calendar = self.calendar
 
-        self.date_progress = 0
+        self.task_progress = 0
+        self.date_progress = sum([1 for _ in self.replay_calendar if _ < self.start_date])
         self.progress.reset()
 
+        if self.date_progress:
+            self.progress.done_tasks = self.date_progress / len(self.replay_calendar)
+
     def next_trade_day(self):
         if self.date_progress < len(self.replay_calendar):
             market_date = self.replay_calendar[self.date_progress]
@@ -1026,7 +1022,7 @@ class ProgressiveReplay(Replay):
             data = self.replay_task[self.task_progress]
             self.task_progress += 1
         else:
-            if self.eod is not None and self.date_progress:
+            if self.eod is not None and self.date_progress and self.replay_calendar[self.date_progress] > self.start_date:
                 self.eod(market_date=self.replay_calendar[self.date_progress - 1], replay=self)
 
             self.replay_task.clear()

{PyAlgoEngine-0.3.12.post3 → PyAlgoEngine-0.3.12.post4}/AlgoEngine/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.12.post3"
+__version__ = "0.3.12.post4"
 
 import traceback
 

{PyAlgoEngine-0.3.12.post3 → PyAlgoEngine-0.3.12.post4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyAlgoEngine
-Version: 0.3.12.post3
+Version: 0.3.12.post4
 Summary: Basic algo engine
 Home-page: https://github.com/BolunHan/PyAlgoEngine
 Author: Bolun.Han

{PyAlgoEngine-0.3.12.post3 → PyAlgoEngine-0.3.12.post4}/PyAlgoEngine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyAlgoEngine
-Version: 0.3.12.post3
+Version: 0.3.12.post4
 Summary: Basic algo engine
 Home-page: https://github.com/BolunHan/PyAlgoEngine
 Author: Bolun.Han