protazeni exportniho okna az do rana pred vyrobu FVE (prichazeli sme o prilezitosti mezi pulnoci a ranem)
This commit is contained in:
@@ -13,7 +13,9 @@ from services.planning_engine import (
|
||||
_dynamic_arb_floor_wh_series,
|
||||
_dispatch_result_comparison,
|
||||
_evening_battery_export_push_indices,
|
||||
_evening_peak_export_indices,
|
||||
_evening_push_discharge_budget_wh,
|
||||
_in_night_battery_export_window,
|
||||
_pre_neg_buy_soc_ceiling_wh,
|
||||
_pre_neg_peak_sell_idx,
|
||||
_prague_hour,
|
||||
@@ -166,6 +168,75 @@ class EveningPushBudgetTests(unittest.TestCase):
|
||||
)
|
||||
self.assertEqual(len(push_lo), 0)
|
||||
|
||||
def test_night_window_includes_midnight_excludes_pv_sunrise(self) -> None:
|
||||
"""23:30 a 00:00 jeden peak; po východu FVE (pv > load) už ne."""
|
||||
prague = ZoneInfo("Europe/Prague")
|
||||
slots = [
|
||||
PlanningSlot(
|
||||
interval_start=datetime(2026, 5, 25, 23, 15, tzinfo=prague),
|
||||
buy_price=5.0,
|
||||
sell_price=3.323,
|
||||
pv_a_forecast_w=0,
|
||||
pv_b_forecast_w=0,
|
||||
load_baseline_w=1800,
|
||||
ev1_connected=False,
|
||||
ev2_connected=False,
|
||||
allow_discharge_export=True,
|
||||
),
|
||||
PlanningSlot(
|
||||
interval_start=datetime(2026, 5, 25, 23, 30, tzinfo=prague),
|
||||
buy_price=5.0,
|
||||
sell_price=3.286,
|
||||
pv_a_forecast_w=0,
|
||||
pv_b_forecast_w=0,
|
||||
load_baseline_w=1800,
|
||||
ev1_connected=False,
|
||||
ev2_connected=False,
|
||||
allow_discharge_export=True,
|
||||
),
|
||||
PlanningSlot(
|
||||
interval_start=datetime(2026, 5, 26, 0, 0, tzinfo=prague),
|
||||
buy_price=5.6,
|
||||
sell_price=3.586,
|
||||
pv_a_forecast_w=0,
|
||||
pv_b_forecast_w=0,
|
||||
load_baseline_w=1800,
|
||||
ev1_connected=False,
|
||||
ev2_connected=False,
|
||||
allow_discharge_export=True,
|
||||
),
|
||||
PlanningSlot(
|
||||
interval_start=datetime(2026, 5, 26, 6, 0, tzinfo=prague),
|
||||
buy_price=4.0,
|
||||
sell_price=3.0,
|
||||
pv_a_forecast_w=10_000,
|
||||
pv_b_forecast_w=0,
|
||||
load_baseline_w=1800,
|
||||
ev1_connected=False,
|
||||
ev2_connected=False,
|
||||
allow_discharge_export=True,
|
||||
),
|
||||
]
|
||||
self.assertTrue(_in_night_battery_export_window(slots[2]))
|
||||
self.assertFalse(_in_night_battery_export_window(slots[3]))
|
||||
peak_ts = _evening_peak_export_indices(slots, degrad_czk_kwh=0.15)
|
||||
self.assertIn(2, peak_ts, "půlnoc musí být v nočním peak pásmu")
|
||||
self.assertNotIn(3, peak_ts)
|
||||
bat = _battery(uc_wh=64_000.0, min_pct=12.0, max_pct=95.0)
|
||||
per_slot = 18_000 * 0.95 * 0.25
|
||||
push = _evening_battery_export_push_indices(
|
||||
slots,
|
||||
profitable_export_ts={0, 1, 2, 3},
|
||||
degrad_czk_kwh=0.15,
|
||||
current_soc_wh=0.9 * bat.soc_max_wh,
|
||||
min_soc_wh=bat.min_soc_wh,
|
||||
soc_max_wh=bat.soc_max_wh,
|
||||
per_slot_discharge_wh=per_slot,
|
||||
discharge_slot_buffer=1.5,
|
||||
)
|
||||
self.assertIn(2, push, "nejvyšší sell 00:00 má být v push před 23:30")
|
||||
self.assertEqual(push[0], 2)
|
||||
|
||||
def test_evening_push_budget_matches_r063_formula(self) -> None:
|
||||
bat = _battery(uc_wh=64_000.0, min_pct=10.0, max_pct=95.0)
|
||||
soc = 0.85 * bat.soc_max_wh
|
||||
@@ -1339,7 +1410,7 @@ class NegativeSellPvChargeTests(unittest.TestCase):
|
||||
50.0,
|
||||
operating_mode="AUTO",
|
||||
)
|
||||
self.assertEqual(snap.get("planner_build_tag"), "2026-05-28-pv-positive-sell-solver-v29")
|
||||
self.assertEqual(snap.get("planner_build_tag"), "2026-05-28-night-export-window-midnight-v30")
|
||||
self.assertGreater(
|
||||
results[0].battery_setpoint_w,
|
||||
2_500,
|
||||
@@ -1489,7 +1560,7 @@ class NegativeSellPvChargeTests(unittest.TestCase):
|
||||
50.0,
|
||||
operating_mode="AUTO",
|
||||
)
|
||||
self.assertEqual(snap.get("planner_build_tag"), "2026-05-28-pv-positive-sell-solver-v29")
|
||||
self.assertEqual(snap.get("planner_build_tag"), "2026-05-28-night-export-window-midnight-v30")
|
||||
self.assertEqual(len(results), len(slots))
|
||||
|
||||
def test_gen_cutoff_full_soc_neg_sell_with_pv_b_feasible(self) -> None:
|
||||
@@ -1553,7 +1624,7 @@ class NegativeSellPvChargeTests(unittest.TestCase):
|
||||
55.0,
|
||||
operating_mode="AUTO",
|
||||
)
|
||||
self.assertEqual(snap.get("planner_build_tag"), "2026-05-28-pv-positive-sell-solver-v29")
|
||||
self.assertEqual(snap.get("planner_build_tag"), "2026-05-28-night-export-window-midnight-v30")
|
||||
self.assertEqual(len(results), len(slots))
|
||||
|
||||
def test_fixed_tariff_neg_sell_no_grid_export(self) -> None:
|
||||
@@ -2209,7 +2280,7 @@ class ChargeAcquisitionArbitrageTests(unittest.TestCase):
|
||||
interval_start=base + timedelta(minutes=15 * i),
|
||||
buy_price=0.8,
|
||||
sell_price=sell,
|
||||
pv_a_forecast_w=6000,
|
||||
pv_a_forecast_w=0,
|
||||
pv_b_forecast_w=0,
|
||||
load_baseline_w=800,
|
||||
ev1_connected=False,
|
||||
@@ -2239,7 +2310,7 @@ class ChargeAcquisitionArbitrageTests(unittest.TestCase):
|
||||
50.0,
|
||||
operating_mode="AUTO",
|
||||
)
|
||||
self.assertEqual(snap["planner_build_tag"], "2026-05-28-pv-positive-sell-solver-v29")
|
||||
self.assertEqual(snap["planner_build_tag"], "2026-05-28-night-export-window-midnight-v30")
|
||||
peak_idx = sells.index(4.04)
|
||||
peak = results[peak_idx]
|
||||
self.assertIn(peak.export_mode, ("BATTERY_SELL", "PV_SURPLUS"))
|
||||
@@ -2254,6 +2325,74 @@ class ChargeAcquisitionArbitrageTests(unittest.TestCase):
|
||||
msg=f"slot {i} sell={sells[i]} must not battery-export before first push",
|
||||
)
|
||||
|
||||
def test_midnight_higher_sell_gets_battery_export(self) -> None:
|
||||
"""home-01 archetyp: export v 00:00 (vyšší sell), ne jen 23:30."""
|
||||
prague = ZoneInfo("Europe/Prague")
|
||||
slots = [
|
||||
PlanningSlot(
|
||||
interval_start=datetime(2026, 5, 25, 23, 15, tzinfo=prague),
|
||||
buy_price=5.28,
|
||||
sell_price=3.323,
|
||||
pv_a_forecast_w=0,
|
||||
pv_b_forecast_w=0,
|
||||
load_baseline_w=1800,
|
||||
ev1_connected=False,
|
||||
ev2_connected=False,
|
||||
allow_charge=False,
|
||||
allow_discharge_export=True,
|
||||
charge_acquisition_buy_czk_kwh=0.8,
|
||||
),
|
||||
PlanningSlot(
|
||||
interval_start=datetime(2026, 5, 25, 23, 30, tzinfo=prague),
|
||||
buy_price=5.23,
|
||||
sell_price=3.286,
|
||||
pv_a_forecast_w=0,
|
||||
pv_b_forecast_w=0,
|
||||
load_baseline_w=1800,
|
||||
ev1_connected=False,
|
||||
ev2_connected=False,
|
||||
allow_charge=False,
|
||||
allow_discharge_export=True,
|
||||
charge_acquisition_buy_czk_kwh=0.8,
|
||||
),
|
||||
PlanningSlot(
|
||||
interval_start=datetime(2026, 5, 26, 0, 0, tzinfo=prague),
|
||||
buy_price=5.63,
|
||||
sell_price=3.586,
|
||||
pv_a_forecast_w=0,
|
||||
pv_b_forecast_w=0,
|
||||
load_baseline_w=1800,
|
||||
ev1_connected=False,
|
||||
ev2_connected=False,
|
||||
allow_charge=False,
|
||||
allow_discharge_export=True,
|
||||
charge_acquisition_buy_czk_kwh=0.8,
|
||||
),
|
||||
]
|
||||
battery = _battery(uc_wh=64_000.0, terminal_soc_value_factor=0.0)
|
||||
battery.max_discharge_power_w = 18_000
|
||||
hp = SimpleNamespace(rated_heating_power_w=0, tuv_min_temp_c=45.0, tuv_target_temp_c=55.0)
|
||||
grid = SimpleNamespace(max_import_power_w=17_000, max_export_power_w=13_500)
|
||||
vehicles = [
|
||||
SimpleNamespace(max_charge_power_w=0, battery_capacity_kwh=1.0, default_target_soc_pct=80.0),
|
||||
SimpleNamespace(max_charge_power_w=0, battery_capacity_kwh=1.0, default_target_soc_pct=80.0),
|
||||
]
|
||||
results, _, snap = solve_dispatch(
|
||||
slots,
|
||||
battery,
|
||||
hp,
|
||||
grid,
|
||||
[None, None],
|
||||
vehicles,
|
||||
0.9 * battery.soc_max_wh,
|
||||
50.0,
|
||||
operating_mode="AUTO",
|
||||
)
|
||||
self.assertEqual(snap["planner_build_tag"], "2026-05-28-night-export-window-midnight-v30")
|
||||
r_midnight = results[2]
|
||||
self.assertEqual(r_midnight.export_mode, "BATTERY_SELL")
|
||||
self.assertGreaterEqual(abs(r_midnight.grid_setpoint_w), 12_500)
|
||||
|
||||
def test_evening_push_export_near_site_cap_home01(self) -> None:
|
||||
"""home-01 večer: export ≈ min(13.5 kW, 18 kW − load), ne (max−load)/2."""
|
||||
prague = ZoneInfo("Europe/Prague")
|
||||
@@ -2292,7 +2431,7 @@ class ChargeAcquisitionArbitrageTests(unittest.TestCase):
|
||||
50.0,
|
||||
operating_mode="AUTO",
|
||||
)
|
||||
self.assertEqual(snap["planner_build_tag"], "2026-05-28-pv-positive-sell-solver-v29")
|
||||
self.assertEqual(snap["planner_build_tag"], "2026-05-28-night-export-window-midnight-v30")
|
||||
r = results[0]
|
||||
self.assertEqual(r.export_mode, "BATTERY_SELL")
|
||||
self.assertGreaterEqual(abs(r.grid_setpoint_w), 12_500)
|
||||
|
||||
Reference in New Issue
Block a user