Skip to content

Commit cb8e7d0

Browse files
[pre-commit.ci lite] apply automatic fixes
1 parent e72b37b commit cb8e7d0

2 files changed

Lines changed: 37 additions & 5 deletions

File tree

‎apps/predbat/energydataservice.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def minute_data_hourly_rates(self, data, forecast_days, midnight_utc, rate_key,
8181
start_time_str = entry.get(from_key)
8282
rate = entry.get(rate_key, 0) * scale
8383
if not use_cent:
84-
# Keep behavior: convert DKK → øre (or cents) if use_cent is False
84+
# Keep behavior: convert DKK → øre (or cents) if use_cent is False
8585
rate = rate * 100.0
8686

8787
# Parse time robustly

‎apps/predbat/unit_test.py‎

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4838,13 +4838,35 @@ def run_execute_tests(my_predbat):
48384838
failed |= run_execute_test(my_predbat, "no_discharge2", export_window_best=export_window_best, export_limits_best=export_limits_best, set_charge_window=True, set_export_window=True, soc_kw=0, assert_status="Hold exporting")
48394839
if failed:
48404840
return failed
4841-
failed |= run_execute_test(my_predbat, "discharge_upcoming1", export_window_best=export_window_best3, export_limits_best=export_limits_best, set_charge_window=True, set_export_window=True, soc_kw=0, assert_force_export=True, assert_discharge_start_time_minutes=my_predbat.minutes_now + 30, assert_discharge_end_time_minutes=my_predbat.minutes_now + 90 + 1)
4841+
failed |= run_execute_test(
4842+
my_predbat,
4843+
"discharge_upcoming1",
4844+
export_window_best=export_window_best3,
4845+
export_limits_best=export_limits_best,
4846+
set_charge_window=True,
4847+
set_export_window=True,
4848+
soc_kw=0,
4849+
assert_force_export=True,
4850+
assert_discharge_start_time_minutes=my_predbat.minutes_now + 30,
4851+
assert_discharge_end_time_minutes=my_predbat.minutes_now + 90 + 1,
4852+
)
48424853
if failed:
48434854
return failed
48444855
failed |= run_execute_test(my_predbat, "no_discharge3b", export_window_best=export_window_best6, export_limits_best=export_limits_best, set_charge_window=True, set_export_window=True, soc_kw=0)
48454856
if failed:
48464857
return failed
4847-
failed |= run_execute_test(my_predbat, "discharge_upcoming2", export_window_best=export_window_best4, export_limits_best=export_limits_best, set_charge_window=True, set_export_window=True, soc_kw=0, assert_force_export=True, assert_discharge_start_time_minutes=my_predbat.minutes_now + 15, assert_discharge_end_time_minutes=my_predbat.minutes_now + 90 + 1)
4858+
failed |= run_execute_test(
4859+
my_predbat,
4860+
"discharge_upcoming2",
4861+
export_window_best=export_window_best4,
4862+
export_limits_best=export_limits_best,
4863+
set_charge_window=True,
4864+
set_export_window=True,
4865+
soc_kw=0,
4866+
assert_force_export=True,
4867+
assert_discharge_start_time_minutes=my_predbat.minutes_now + 15,
4868+
assert_discharge_end_time_minutes=my_predbat.minutes_now + 90 + 1,
4869+
)
48484870
if failed:
48494871
return failed
48504872

@@ -5227,8 +5249,18 @@ def run_execute_tests(my_predbat):
52275249
failed |= run_execute_test(my_predbat, "no_charge5", set_charge_window=True, set_export_window=True)
52285250
failed |= run_execute_test(my_predbat, "car", car_slot=charge_window_best, set_charge_window=True, set_export_window=True, assert_status="Hold for car", assert_pause_discharge=True, assert_discharge_rate=1000, soc_kw=1, assert_immediate_soc_target=10)
52295251
failed |= run_execute_test(
5230-
my_predbat, "car2",
5231-
car_slot=charge_window_best, set_charge_window=True, set_export_window=True, assert_status="Hold for car", assert_pause_discharge=False, assert_discharge_rate=0, has_timed_pause=False, soc_kw=1, assert_immediate_soc_target=10, assert_reserve=11
5252+
my_predbat,
5253+
"car2",
5254+
car_slot=charge_window_best,
5255+
set_charge_window=True,
5256+
set_export_window=True,
5257+
assert_status="Hold for car",
5258+
assert_pause_discharge=False,
5259+
assert_discharge_rate=0,
5260+
has_timed_pause=False,
5261+
soc_kw=1,
5262+
assert_immediate_soc_target=10,
5263+
assert_reserve=11,
52325264
)
52335265
failed |= run_execute_test(
52345266
my_predbat,

0 commit comments

Comments
 (0)