From a10faf5e60478a0c3507e65fa100d75e50552d9f Mon Sep 17 00:00:00 2001 From: Ichinga Samuel Date: Tue, 10 Sep 2024 17:45:36 +0100 Subject: [PATCH] testdata --- src/aiomql/contrib/backtester/event_manager.py | 4 +--- src/aiomql/contrib/backtester/test_data.py | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/aiomql/contrib/backtester/event_manager.py b/src/aiomql/contrib/backtester/event_manager.py index d380e3a..bd3ac76 100644 --- a/src/aiomql/contrib/backtester/event_manager.py +++ b/src/aiomql/contrib/backtester/event_manager.py @@ -29,8 +29,7 @@ class EventManager: self.tasks.extend(task) def sigint_handler(self, sig, frame): - for task in self.tasks: - task.cancel() if not task.done() else ... + print(self.config.test_data) async def acquire(self): await self.condition.acquire() @@ -45,7 +44,6 @@ class EventManager: self.task_tracker = 0 await self.config.test_data.tracker() self.config.test_data.next() - print(self.config.test_data.cursor.time) self.condition.notify_all() await asyncio.sleep(0) diff --git a/src/aiomql/contrib/backtester/test_data.py b/src/aiomql/contrib/backtester/test_data.py index afaf937..e9aff5f 100644 --- a/src/aiomql/contrib/backtester/test_data.py +++ b/src/aiomql/contrib/backtester/test_data.py @@ -84,8 +84,6 @@ class TestData: await asyncio.gather(*order_tasks) def save(self): - self._data.history_deals = self.history_deals - self._data.history_orders = self.history_orders for symbol in self.orders: self.history_orders = pd.concat([DataFrame(self.orders[symbol].values()), self.history_orders]) self._data.history_orders = self.history_orders @@ -131,7 +129,6 @@ class TestData: order = self.open_orders.pop(ticket) order = order._asdict() order.update(time_done=self.cursor.time) - self.orders[order['symbol']][ticket] = TradeOrder(order) self.update_account(profit=position.profit, margin=-margin) def modify_stops(self, ticket: int, sl: int = None, tp: int = None):