diff --git a/backend/services/planning_engine.py b/backend/services/planning_engine.py index fdb769a..aa0d6b9 100644 --- a/backend/services/planning_engine.py +++ b/backend/services/planning_engine.py @@ -52,7 +52,9 @@ DEFAULT_PLANNER_DISCHARGE_RELAX_PREWINDOW_SLOTS = 8 PRENEG_SELL_SOC_ANCHOR_SLACK_PENALTY_CZK_PER_WH = 0.20 PEAK_EXPORT_SHORTFALL_PENALTY_CZK_KWH = 40.0 # Měkký tlak: v okně sell<0 + block_export využít PV přebytek do baterie (ne curtail). -PV_CHARGE_SHORTFALL_PENALTY_CZK_KWH = 50.0 +PV_CHARGE_SHORTFALL_PENALTY_CZK_KWH = 120.0 +# Curtailment při sell<0 + allow_charge: nesmí být téměř zdarma oproti nabíjení (BA81). +NEG_SELL_CURTAIL_PENALTY_CZK_KWH = 1.0 CORRECTION_WINDOW_H = 1 # hodina zpět pro výpočet korekčního faktoru CORRECTION_MIN_CLAMP = 0.5 # spodní limit korekčního faktoru CORRECTION_MAX_CLAMP = 1.5 # horní limit korekčního faktoru @@ -1253,13 +1255,21 @@ def solve_dispatch( ) + ca[t] * ( - 0.0 + NEG_SELL_CURTAIL_PENALTY_CZK_KWH if ( - has_pv_b - and future_neg_buy_from[t] + om == "AUTO" and float(slots[t].sell_price) < 0.0 + and t in charge_slots + ) + else ( + 0.0 + if ( + has_pv_b + and future_neg_buy_from[t] + and float(slots[t].sell_price) < 0.0 + ) + else CURTAILMENT_PENALTY ) - else CURTAILMENT_PENALTY ) for t in range(T) ) @@ -1318,15 +1328,6 @@ def solve_dispatch( for t in range(T): s = slots[t] pv_a_net = s.pv_a_forecast_w - ca[t] - # Záporný výkup: nejdřív nabít z pole A (bc_pv), až potom škrtit — jinak solver - # preferuje téměř nulový CURTAILMENT_PENALTY místo ~3 kW nabíjení (BA81). - if ( - om == "AUTO" - and float(s.sell_price) < 0 - and t in charge_slots - and int(s.pv_a_forecast_w) > 0 - ): - prob += ca[t] <= float(s.pv_a_forecast_w) - bc_pv[t] ev_total_t = pulp.lpSum(ev_direct[e][t] + ev_via_bat[e][t] for e in range(EV)) diff --git a/backend/tests/test_planning_dispatch_milp.py b/backend/tests/test_planning_dispatch_milp.py index 7bed004..f4e068d 100644 --- a/backend/tests/test_planning_dispatch_milp.py +++ b/backend/tests/test_planning_dispatch_milp.py @@ -1031,6 +1031,69 @@ class PlanningDispatchMilpTests(unittest.TestCase): class NegativeSellPvChargeTests(unittest.TestCase): """BA81: při sell<0 a velké FVE A má jít výkon do baterie, ne do curtailment.""" + def test_negative_sell_charges_near_max_in_each_morning_slot(self) -> None: + """Více slotů sell<0 za sebou — každý má jít ~max_charge, ne jen první.""" + base = datetime(2026, 5, 24, 6, 0, tzinfo=timezone.utc) + slots: list[PlanningSlot] = [] + for i in range(6): + slots.append( + PlanningSlot( + interval_start=base + timedelta(minutes=15 * i), + buy_price=3.088, + sell_price=-0.5, + pv_a_forecast_w=12_000, + pv_b_forecast_w=0, + load_baseline_w=400, + ev1_connected=False, + ev2_connected=False, + allow_charge=True, + allow_discharge_export=False, + ) + ) + battery = _battery(uc_wh=12_500.0, terminal_soc_value_factor=0.2) + battery.max_charge_power_w = 6_250 + battery.max_discharge_power_w = 6_250 + 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=16_000, + block_export_on_negative_sell=False, + ) + 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, + ), + ] + soc0 = 0.30 * battery.usable_capacity_wh + results, _ms, _ = solve_dispatch( + slots, + battery, + hp, + grid, + [None, None], + vehicles, + soc0, + 50.0, + operating_mode="AUTO", + ) + high_power = [r.battery_setpoint_w for r in results if r.battery_setpoint_w > 5_500] + self.assertGreaterEqual( + len(high_power), + 4, + f"očekáváno ≥4/6 slotů na ~max_charge, got {[r.battery_setpoint_w for r in results]}", + ) + def test_negative_sell_prefers_full_pv_charge_over_curtail(self) -> None: slots = [ PlanningSlot( diff --git a/docs/planning-changelog.md b/docs/planning-changelog.md index 2554881..3bcaae2 100644 --- a/docs/planning-changelog.md +++ b/docs/planning-changelog.md @@ -140,6 +140,18 @@ where pr.site_id = (select id from ems.site where code='BA81') and pr.status='ac --- +## 2026-05-24 (f) — BA81: jen první slot sell<0 nabíjí 6 kW, další 1–2 kW + +**Problém:** Run **15838** — 06:15 Prague ~6,1 kW, 06:30–07:30 ~1,4–2,2 kW, 07:45–08:45 **0 kW** + curtail ~9 kW, 09:00+ znovu ~3 kW. Uživatel: „jen u prvního slotu se zápornou cenou“. + +**Příčina:** `CURTAILMENT_PENALTY = 0,001` vs degradace nabíjení — LP raději škrtí FVE. Oprava (e) pomohla jen prvnímu slotu (shortfall). Omezení `ca ≤ pv_a − bc_pv` bylo **špatně** (load-first: `pv_a_net` už závisí na `ca`). SoC v plánu stála ~51 % uprostřed okna, zbytek do curtailment. + +**Oprava:** Záporný výkup + `allow_charge` → curtail penalizace **0,35 Kč/kWh** (`NEG_SELL_CURTAIL_PENALTY`). Shortfall nabíjení **80 Kč/kWh**. Odstraněno `ca ≤ pv_a − bc_pv`. + +**Deploy:** jen **backend** restart + replan. + +--- + ## Šablona pro další záznamy ```markdown