Branch 2: home-01 neg-večer — export k reserve_soc, fix pos_sell_pre_neg_buy + oddělit evening_push od prep relax
This commit is contained in:
@@ -3326,8 +3326,8 @@ class ChargeAcquisitionArbitrageTests(unittest.TestCase):
|
||||
self.assertFalse(snap["inputs"].get("evening_push_hard_suppressed"))
|
||||
self.assertLess(results[0].grid_setpoint_w, -1000)
|
||||
|
||||
def test_relaxed_neg_prep_suppresses_hard_push_only(self) -> None:
|
||||
"""v57: relaxed_neg_prep_window vypne jen tvrdý push, ne seznam slotů."""
|
||||
def test_relaxed_neg_prep_keeps_hard_push_v64(self) -> None:
|
||||
"""v64: relaxed_neg_prep_window nesmí vypnout tvrdý evening push (jen fallback)."""
|
||||
prague = ZoneInfo("Europe/Prague")
|
||||
slots = [
|
||||
PlanningSlot(
|
||||
@@ -3377,7 +3377,7 @@ class ChargeAcquisitionArbitrageTests(unittest.TestCase):
|
||||
current_tuv_temp_c=55.0,
|
||||
relaxed_neg_prep_window=True,
|
||||
)
|
||||
self.assertTrue(snap["inputs"].get("evening_push_hard_suppressed"))
|
||||
self.assertFalse(snap["inputs"].get("evening_push_hard_suppressed"))
|
||||
push_iso = snap["inputs"].get("evening_push_ts") or []
|
||||
self.assertGreaterEqual(len(push_iso), 1)
|
||||
|
||||
@@ -3458,6 +3458,93 @@ class ChargeAcquisitionArbitrageTests(unittest.TestCase):
|
||||
],
|
||||
)
|
||||
|
||||
def test_future_neg_buy_evening_export_at_high_soc_relaxed_prep(self) -> None:
|
||||
"""v64: před buy<0 večerní export i při relaxed_neg_prep_window (neg-evening bundle)."""
|
||||
prague = ZoneInfo("Europe/Prague")
|
||||
base = datetime(2026, 6, 6, 19, 0, tzinfo=prague).astimezone(timezone.utc)
|
||||
slots: list[PlanningSlot] = []
|
||||
for i in range(96):
|
||||
local = (base + timedelta(minutes=15 * i)).astimezone(prague)
|
||||
d, h, m = local.day, local.hour, local.minute
|
||||
hm = h + m / 60.0
|
||||
if d == 6:
|
||||
buy, sell = 3.0, 5.3
|
||||
pv_a, pv_b = 0, 0
|
||||
else:
|
||||
sell = -0.2 if hm >= 5.75 and hm < 15 else 2.5
|
||||
buy = -0.5 if 11 <= hm < 14 else 2.0
|
||||
pv_a = 6000 if 8 <= h < 16 else 200
|
||||
pv_b = 8000 if 8 <= h < 16 else 200
|
||||
slots.append(
|
||||
PlanningSlot(
|
||||
interval_start=base + timedelta(minutes=15 * i),
|
||||
buy_price=buy,
|
||||
sell_price=sell,
|
||||
pv_a_forecast_w=pv_a,
|
||||
pv_b_forecast_w=pv_b,
|
||||
load_baseline_w=500,
|
||||
ev1_connected=False,
|
||||
ev2_connected=False,
|
||||
allow_charge=True,
|
||||
allow_discharge_export=True,
|
||||
charge_acquisition_buy_czk_kwh=0.8,
|
||||
)
|
||||
)
|
||||
bat = _battery(uc_wh=64_000.0, arb_pct=20.0, terminal_soc_value_factor=0.0)
|
||||
bat.max_discharge_power_w = 18_000
|
||||
bat.max_charge_power_w = 18_000
|
||||
bat.planner_neg_sell_prep_soc_percent = 80
|
||||
bat.planner_neg_sell_full_soc_tail_slots = 4
|
||||
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,
|
||||
block_export_on_negative_sell=False,
|
||||
purchase_pricing_mode="spot",
|
||||
)
|
||||
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),
|
||||
]
|
||||
relax_kw = dict(
|
||||
relaxed_expensive_import=True,
|
||||
relaxed_neg_buy_charge=True,
|
||||
relaxed_neg_prep_hold_only=True,
|
||||
relaxed_neg_prep_window=True,
|
||||
)
|
||||
results_hi, _ms, snap_hi = solve_dispatch(
|
||||
slots,
|
||||
bat,
|
||||
hp,
|
||||
grid,
|
||||
[None, None],
|
||||
vehicles,
|
||||
0.81 * bat.soc_max_wh,
|
||||
50.0,
|
||||
operating_mode="AUTO",
|
||||
**relax_kw,
|
||||
)
|
||||
self.assertTrue(snap_hi["inputs"].get("future_neg_buy_discharge"))
|
||||
self.assertGreater(len(snap_hi["inputs"].get("neg_evening_push_slots") or []), 0)
|
||||
self.assertLess(results_hi[0].grid_setpoint_w, -1000)
|
||||
self.assertLess(results_hi[0].battery_soc_target, 80.0)
|
||||
|
||||
results_mid, _ms2, snap_mid = solve_dispatch(
|
||||
slots,
|
||||
bat,
|
||||
hp,
|
||||
grid,
|
||||
[None, None],
|
||||
vehicles,
|
||||
0.35 * bat.soc_max_wh,
|
||||
50.0,
|
||||
operating_mode="AUTO",
|
||||
**relax_kw,
|
||||
)
|
||||
self.assertFalse(snap_mid["inputs"].get("evening_push_hard_suppressed"))
|
||||
self.assertFalse(snap_mid["inputs"].get("neg_sell_phases_fallback"))
|
||||
self.assertLess(results_mid[0].grid_setpoint_w, -1000)
|
||||
|
||||
def test_kv1_evening_push_profitable_vs_morning_zone_peak(self) -> None:
|
||||
"""v52: KV1 večer ≥ ranní max (5–11) − degrad; pod prahem ne."""
|
||||
prague = ZoneInfo("Europe/Prague")
|
||||
|
||||
Reference in New Issue
Block a user