tuning palnneru

This commit is contained in:
Dusan Vojacek
2026-05-04 19:04:48 +02:00
parent 405e832f8d
commit bcb05d4896
17 changed files with 713 additions and 72 deletions

View File

@@ -0,0 +1,52 @@
"""PASSIVE + nabíjení z PV přebytku při současném exportu → nenulový nabíjecí proud."""
from __future__ import annotations
import unittest
from services.control.setpoints import deye_battery_charge_discharge_amps
class PassivePvSurplusChargeAmpsTests(unittest.TestCase):
def test_passive_charge_while_exporting_grid_negative(self) -> None:
ch, dis = deye_battery_charge_discharge_amps(
lock_battery=False,
deye_mode="PASSIVE",
self_sustain_local_use=False,
bat_w=5000,
grid_w=-2000,
max_charge_a=100,
max_discharge_a=100,
)
self.assertGreater(ch, 0)
self.assertEqual(dis, 0)
def test_passive_zero_export_still_zero_charge_when_no_battery_charge(self) -> None:
ch, dis = deye_battery_charge_discharge_amps(
lock_battery=False,
deye_mode="PASSIVE",
self_sustain_local_use=False,
bat_w=0,
grid_w=-2000,
max_charge_a=100,
max_discharge_a=100,
)
self.assertEqual(ch, 0)
self.assertEqual(dis, 100)
def test_sell_unchanged(self) -> None:
ch, dis = deye_battery_charge_discharge_amps(
lock_battery=False,
deye_mode="SELL",
self_sustain_local_use=False,
bat_w=-3000,
grid_w=-2000,
max_charge_a=100,
max_discharge_a=80,
)
self.assertEqual(ch, 0)
self.assertEqual(dis, 80)
if __name__ == "__main__":
unittest.main()

View File

@@ -237,7 +237,7 @@ class PlanningDispatchMilpTests(unittest.TestCase):
),
]
soc0 = 0.50 * battery.usable_capacity_wh
results, _ms = solve_dispatch(
results, _ms, _ = solve_dispatch(
slots,
battery,
hp,
@@ -278,7 +278,7 @@ class PlanningDispatchMilpTests(unittest.TestCase):
),
]
soc0 = battery.soc_max_wh
results, _ms = solve_dispatch(
results, _ms, _ = solve_dispatch(
slots,
battery,
hp,
@@ -317,7 +317,7 @@ class PlanningDispatchMilpTests(unittest.TestCase):
),
]
soc0 = 0.15 * battery.usable_capacity_wh
results, ms = solve_dispatch(
results, ms, _ = solve_dispatch(
slots,
battery,
hp,
@@ -357,7 +357,7 @@ class PlanningDispatchMilpTests(unittest.TestCase):
),
]
soc0 = 0.12 * battery.usable_capacity_wh
results, _ms = solve_dispatch(
results, _ms, _ = solve_dispatch(
slots,
battery,
hp,
@@ -393,7 +393,7 @@ class PlanningDispatchMilpTests(unittest.TestCase):
),
]
soc0 = 0.5 * battery.usable_capacity_wh
results, _ms = solve_dispatch(
results, _ms, _ = solve_dispatch(
slots,
battery,
hp,
@@ -433,7 +433,7 @@ class PlanningDispatchMilpTests(unittest.TestCase):
),
]
soc0 = 0.22 * battery.usable_capacity_wh
results, _ms = solve_dispatch(
results, _ms, _ = solve_dispatch(
slots,
battery,
hp,
@@ -511,7 +511,7 @@ class PlanningDispatchMilpTests(unittest.TestCase):
),
]
soc0 = 0.88 * battery.usable_capacity_wh
results, _ms = solve_dispatch(
results, _ms, _ = solve_dispatch(
slots,
battery,
hp,
@@ -593,7 +593,7 @@ class PlanningDispatchMilpTests(unittest.TestCase):
SimpleNamespace(max_charge_power_w=0, battery_capacity_kwh=1.0, default_target_soc_pct=80.0),
]
soc0 = 0.9 * battery.usable_capacity_wh
results, _ms = solve_dispatch(
results, _ms, _ = solve_dispatch(
slots,
battery,
hp,
@@ -680,7 +680,7 @@ class PlanningDispatchMilpTests(unittest.TestCase):
SimpleNamespace(max_charge_power_w=0, battery_capacity_kwh=1.0, default_target_soc_pct=80.0),
]
soc0 = 0.9 * battery.usable_capacity_wh
results, _ms = solve_dispatch(
results, _ms, _ = solve_dispatch(
slots,
battery,
hp,
@@ -755,7 +755,7 @@ class PlanningDispatchMilpTests(unittest.TestCase):
SimpleNamespace(max_charge_power_w=0, battery_capacity_kwh=1.0, default_target_soc_pct=80.0),
]
soc0 = 0.9 * battery.usable_capacity_wh
results, _ms = solve_dispatch(
results, _ms, _ = solve_dispatch(
slots,
battery,
hp,
@@ -798,7 +798,7 @@ class PlanningDispatchMilpTests(unittest.TestCase):
),
]
soc0 = 0.55 * battery.usable_capacity_wh
results, _ms = solve_dispatch(
results, _ms, _ = solve_dispatch(
slots,
battery,
hp,
@@ -853,7 +853,7 @@ class PlanningDispatchMilpTests(unittest.TestCase):
SimpleNamespace(max_charge_power_w=0, battery_capacity_kwh=1.0, default_target_soc_pct=80.0),
]
soc0 = 0.55 * battery.usable_capacity_wh
results, _ms = solve_dispatch(
results, _ms, _ = solve_dispatch(
slots,
battery,
hp,
@@ -913,7 +913,7 @@ class PlanningDispatchMilpTests(unittest.TestCase):
),
]
soc0 = 0.34 * battery.usable_capacity_wh
results, _ms = solve_dispatch(
results, _ms, _ = solve_dispatch(
slots,
battery,
hp,
@@ -983,7 +983,7 @@ class TerminalSocShadowTests(unittest.TestCase):
),
]
soc0 = 0.5 * battery.usable_capacity_wh
results, _ms = solve_dispatch(
results, _ms, _ = solve_dispatch(
slots,
battery,
hp,

View File

@@ -0,0 +1,140 @@
"""Měkké safety SoC a rolling charge commitment v solve_dispatch."""
from __future__ import annotations
import unittest
from datetime import datetime, timedelta, timezone
from types import SimpleNamespace
from services.planning_engine import PlanningSlot, solve_dispatch
def _bat(**kwargs: object) -> SimpleNamespace:
base = dict(
usable_capacity_wh=20_000.0,
min_soc_wh=2000.0,
arb_floor_wh=4000.0,
reserve_soc_wh=4000.0,
soc_max_wh=19_000.0,
charge_efficiency=0.95,
discharge_efficiency=0.95,
degradation_cost_czk_kwh=0.1,
max_charge_power_w=5000,
max_discharge_power_w=5000,
planner_terminal_soc_value_factor=0.2,
planner_extreme_buy_threshold_czk_kwh=-5.0,
planner_discharge_floor_percent=None,
planner_discharge_relax_prewindow_slots=8,
planner_daytime_charge_target_enabled=True,
planner_charge_commitment_penalty_czk_kwh=0.5,
)
base.update(kwargs)
return SimpleNamespace(**base)
def _grid() -> SimpleNamespace:
return SimpleNamespace(
max_import_power_w=11_000,
max_export_power_w=11_000,
block_export_on_negative_sell=False,
deye_gen_microinverter_cutoff_enabled=False,
)
def _hp() -> SimpleNamespace:
return SimpleNamespace(rated_heating_power_w=0, tuv_min_temp_c=45.0, tuv_target_temp_c=55.0)
def _slot(
t0: datetime,
idx: int,
*,
buy: float = 3.0,
sell: float = 2.5,
pv_a: int = 0,
load: int = 1500,
safety: float | None = None,
fut_buy: float | None = None,
fut_sell: float | None = None,
) -> PlanningSlot:
return PlanningSlot(
interval_start=t0 + timedelta(minutes=15 * idx),
buy_price=buy,
sell_price=sell,
pv_a_forecast_w=pv_a,
pv_b_forecast_w=0,
load_baseline_w=load,
ev1_connected=False,
ev2_connected=False,
allow_charge=True,
allow_discharge_export=True,
safety_soc_target_wh=safety,
future_avoided_buy_czk_kwh=fut_buy,
future_sell_opportunity_czk_kwh=fut_sell,
)
class PlanningSafetyCommitmentTests(unittest.TestCase):
def test_solver_snapshot_has_version_and_masks(self) -> None:
t0 = datetime(2026, 5, 4, 8, 0, tzinfo=timezone.utc)
slots = [_slot(t0, i, buy=2.0, sell=2.0, pv_a=6000, load=1500) for i in range(8)]
hp, grid = _hp(), _grid()
vehicles = [
SimpleNamespace(max_charge_power_w=0, battery_capacity_kwh=1.0, default_target_soc_pct=80.0)
] * 2
res, _ms, snap = solve_dispatch(
slots,
_bat(),
hp,
grid,
[None, None],
vehicles,
current_soc_wh=5000.0,
current_tuv_temp_c=50.0,
operating_mode="AUTO",
)
self.assertEqual(len(res), 8)
self.assertEqual(snap.get("version"), 1)
self.assertIn("masks", snap)
self.assertEqual(len(snap["masks"]), 8)
def test_charge_commitment_snapshot_populated(self) -> None:
"""Rolling kotva: při předchozím nabíjení z PV se do snapshotu zapíše commitment."""
t0 = datetime(2026, 5, 4, 10, 0, tzinfo=timezone.utc)
slots = [_slot(t0, i, buy=1.5, sell=1.2, pv_a=8000, load=1000) for i in range(12)]
hp, grid = _hp(), _grid()
vehicles = [
SimpleNamespace(max_charge_power_w=0, battery_capacity_kwh=1.0, default_target_soc_pct=80.0)
] * 2
prev = [None] * 12
prev[0] = 4000.0
_res1, _, snap1 = solve_dispatch(
slots,
_bat(),
hp,
grid,
[None, None],
vehicles,
current_soc_wh=4000.0,
current_tuv_temp_c=50.0,
operating_mode="AUTO",
charge_commitment_prev_w=prev,
)
self.assertTrue(snap1["chosen_slots"]["charge_commitment"])
_res2, _, snap2 = solve_dispatch(
slots,
_bat(),
hp,
grid,
[None, None],
vehicles,
current_soc_wh=4000.0,
current_tuv_temp_c=50.0,
operating_mode="AUTO",
charge_commitment_prev_w=None,
)
self.assertEqual(snap2["chosen_slots"]["charge_commitment"], [])
if __name__ == "__main__":
unittest.main()