From 99dd7feba6b497f527d13ea794ad27cd847c5606 Mon Sep 17 00:00:00 2001 From: Matthew Daubney Date: Tue, 22 Sep 2026 18:04:25 +0100 Subject: [PATCH] Refactor `BatteryModel` and market handling for improved time tracking, logging, and market rate calculations Something is slow, I suspect its the logging, but time is tight, so I'm going to wrap up to make it at least useable --- src/batterymodel/models/battery.py | 3 ++- src/batterymodel/models/market.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/batterymodel/models/battery.py b/src/batterymodel/models/battery.py index f5a810c..80e671f 100644 --- a/src/batterymodel/models/battery.py +++ b/src/batterymodel/models/battery.py @@ -110,7 +110,8 @@ class BatteryModel: self._current_charge_value) def log_state_change(self, fn, original_state, new_state): - self._decision_log_handle.write(f"{self.current_time},{self._runtime},{fn},{original_state},{new_state}\n") + # self._decision_log_handle.write(f"{self.current_time},{self._runtime},{fn},{original_state},{new_state}\n") + pass def handle_storage_capacity_check(self, previous_state: "BatteryModel"): if self._charge_discharge_cycles > previous_state._charge_discharge_cycles and self._charge_discharge_cycles / int(self._charge_discharge_cycles) == 1: diff --git a/src/batterymodel/models/market.py b/src/batterymodel/models/market.py index 53f73ac..ed5e21e 100644 --- a/src/batterymodel/models/market.py +++ b/src/batterymodel/models/market.py @@ -42,7 +42,7 @@ class MarketState: elif last_timestamp is not None and last_timestamp < key and key_delta > delta: return last_timestamp, self._market_data[last_timestamp] else: - last_timestamp = key + last_timestamp = key return None