diff --git a/backend/services/planning_engine.py b/backend/services/planning_engine.py index eceb31e..564dc24 100644 --- a/backend/services/planning_engine.py +++ b/backend/services/planning_engine.py @@ -71,7 +71,7 @@ NEG_BUY_CHARGE_SHORTFALL_PENALTY_CZK_KWH = 100.0 PRE_NEG_CHARGE_PENALTY_CZK_KWH = 400.0 PRE_NEG_BATT_EXPORT_SHORTFALL_PENALTY_CZK_KWH = 80.0 PRE_NEG_BATT_EXPORT_MIN_SELL_CZK_KWH = 1.0 -PLANNER_BUILD_TAG = "2026-06-01-fixed-pv-export-min-sell-charge-v58" +PLANNER_BUILD_TAG = "2026-06-01-fixed-grid-charge-min-sell-v59" # Ranní slabá FVE: neaplikovat pv_store ge_pv=0 (jinak curtail při sell < večerní peak). DAWN_LOW_PV_NO_CURTAIL_W = 1500 # BA81/KV1: PV→bat jen v těsné blízkosti nejnižšího sell v horizontu (≈ poledne), ne při ~3 Kč ráno. @@ -4039,14 +4039,25 @@ def solve_dispatch( + FIXED_PV_CHARGE_ONLY_NEAR_MIN_SELL_CZK_KWH ) ) - fixed_high_sell_no_pv_charge = ( + fixed_sell_above_horizon_min = ( purchase_fixed_pre and fixed_horizon_min_sell_pre is not None and sell_t >= 0.0 - and pv_surplus_w > NIGHT_EXPORT_PV_SUNRISE_SURPLUS_W and sell_t > fixed_horizon_min_sell_pre + FIXED_PV_CHARGE_ONLY_NEAR_MIN_SELL_CZK_KWH ) + fixed_high_sell_no_pv_charge = ( + fixed_sell_above_horizon_min + and pv_surplus_w > NIGHT_EXPORT_PV_SUNRISE_SURPLUS_W + ) + fixed_grid_charge_unprofitable = ( + purchase_fixed_pre + and buy_t >= 0.0 + and ( + sell_t < buy_t + min_spread + or fixed_sell_above_horizon_min + ) + ) fixed_pv_b_export_cap = ( purchase_fixed_pre and float(s.pv_b_forecast_w) > 0 @@ -4055,8 +4066,16 @@ def solve_dispatch( and not fixed_pre_neg_pv_export and int(s.pv_a_forecast_w) >= DAWN_LOW_PV_NO_CURTAIL_W ) + if fixed_grid_charge_unprofitable: + prob += bc_gi[t] == 0 if fixed_high_sell_no_pv_charge: prob += bc_pv[t] == 0 + if ( + purchase_fixed_pre + and t in evening_push_ts + and sell_t > buy_t + min_spread + ): + prob += bc_pv[t] == 0 prob += bc_gi[t] == 0 if fixed_pre_neg_pv_export: prob += ge_pv[t] <= max(0.0, pv_surplus_w) diff --git a/backend/tests/test_planning_dispatch_milp.py b/backend/tests/test_planning_dispatch_milp.py index 1e6d0ca..5f6d46f 100644 --- a/backend/tests/test_planning_dispatch_milp.py +++ b/backend/tests/test_planning_dispatch_milp.py @@ -1757,6 +1757,136 @@ class NegativeSellPvChargeTests(unittest.TestCase): "min sell: nabíjení z PV", ) + def test_fixed_no_grid_charge_when_sell_below_buy(self) -> None: + """v59: KV1 — sell < buy nesmí grid→bat (22h za 6 Kč).""" + prague = ZoneInfo("Europe/Prague") + slot = PlanningSlot( + interval_start=datetime(2026, 6, 1, 22, 0, tzinfo=prague).astimezone( + timezone.utc + ), + buy_price=6.353, + sell_price=3.5, + pv_a_forecast_w=0, + pv_b_forecast_w=0, + load_baseline_w=400, + ev1_connected=False, + ev2_connected=False, + allow_charge=True, + allow_discharge_export=False, + charge_acquisition_buy_czk_kwh=6.353, + ) + battery = _battery(uc_wh=12_500.0, min_pct=10.0, arb_pct=30.0) + battery.max_charge_power_w = 6250 + 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=8000, + block_export_on_negative_sell=True, + purchase_pricing_mode="fixed", + ) + 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.25 * battery.usable_capacity_wh + results, _, _ = solve_dispatch( + [slot], + battery, + hp, + grid, + [None, None], + vehicles, + soc0, + 50.0, + operating_mode="AUTO", + ) + self.assertLessEqual( + results[0].battery_setpoint_w, + 200, + "sell < buy: žádné grid nabíjení", + ) + + def test_fixed_evening_push_no_charge_at_peak_sell(self) -> None: + """v59: večerní push — při sell>buy ne nabíjet, jen vybíjet.""" + prague = ZoneInfo("Europe/Prague") + slot = PlanningSlot( + interval_start=datetime(2026, 6, 1, 20, 45, tzinfo=prague).astimezone( + timezone.utc + ), + buy_price=3.088, + sell_price=9.61, + pv_a_forecast_w=2000, + pv_b_forecast_w=200, + load_baseline_w=400, + ev1_connected=False, + ev2_connected=False, + allow_charge=True, + allow_discharge_export=True, + charge_acquisition_buy_czk_kwh=3.088, + future_sell_opportunity_czk_kwh=9.0, + ) + battery = _battery(uc_wh=12_500.0, min_pct=10.0, arb_pct=30.0) + battery.max_charge_power_w = 6250 + battery.max_discharge_power_w = 6250 + 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=8000, + block_export_on_negative_sell=False, + purchase_pricing_mode="fixed", + ) + 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.85 * battery.usable_capacity_wh + results, _, _ = solve_dispatch( + [slot], + battery, + hp, + grid, + [None, None], + vehicles, + soc0, + 50.0, + operating_mode="AUTO", + ) + r0 = results[0] + self.assertLessEqual( + r0.battery_setpoint_w, + 200, + "večerní peak: ne nabíjet baterii", + ) + self.assertLess( + r0.battery_setpoint_w, + -500, + "večerní peak: vývoz z baterie", + ) + def test_fixed_night_profitable_export_not_evening_early_banned(self) -> None: """v58: v noci sell>buy nesmí evening_early držet ge_bat=0.""" prague = ZoneInfo("Europe/Prague") diff --git a/db/routines/R__063_fn_load_planning_slots_full.sql b/db/routines/R__063_fn_load_planning_slots_full.sql index edaf489..9d8db96 100644 --- a/db/routines/R__063_fn_load_planning_slots_full.sql +++ b/db/routines/R__063_fn_load_planning_slots_full.sql @@ -664,13 +664,19 @@ begin from _ems_plan_slot_wk w2 where w2.sell_price > w2.buy_price + v_degrad_czk_kwh ) then - -- Fixní nákup (BA81): buy konstantní — grid nabíjení před exportním oknem, AM/PM rozpočet. + -- Fixní nákup (BA81/KV1): grid jen u nejnižšího sell v horizontu (ne slot_ord → 22h za 6 Kč). v_cum := 0; v_grid_slots_am := 0; for r_slot in select wk.slot_ord from _ems_plan_slot_wk wk where extract(hour from wk.interval_start at time zone 'Europe/Prague') < 12 + and wk.sell_price >= 0 + and wk.sell_price <= ( + select min(w3.sell_price) + from _ems_plan_slot_wk w3 + where w3.sell_price >= 0 + ) + v_degrad_czk_kwh + 0.05 order by case when (wk.interval_start at time zone 'Europe/Prague')::date = v_plan_day_prague @@ -684,6 +690,7 @@ begin else 1 end, wk.is_predicted_price::int, + wk.sell_price asc, wk.slot_ord loop exit when v_cum >= v_chg_am_wh; @@ -716,6 +723,12 @@ begin select wk.slot_ord from _ems_plan_slot_wk wk where extract(hour from wk.interval_start at time zone 'Europe/Prague') >= 12 + and wk.sell_price >= 0 + and wk.sell_price <= ( + select min(w3.sell_price) + from _ems_plan_slot_wk w3 + where w3.sell_price >= 0 + ) + v_degrad_czk_kwh + 0.05 order by case when (wk.interval_start at time zone 'Europe/Prague')::date = v_plan_day_prague @@ -729,6 +742,7 @@ begin else 1 end, wk.is_predicted_price::int, + wk.sell_price asc, wk.slot_ord loop exit when v_cum >= v_chg_pm_wh; diff --git a/docs/04-modules/planning.md b/docs/04-modules/planning.md index ab2fe7e..f69c0a1 100644 --- a/docs/04-modules/planning.md +++ b/docs/04-modules/planning.md @@ -19,7 +19,7 @@ - **Tvrdé výkonové limity site/baterie:** `gi ≤ site_grid_connection.max_import_power_w` (breaker); **`bc_pv + bc_gi ≤ asset_battery.max_charge_power_w`**; **`ge ≤ max_export_power_w`** (proměnná `ge`, platí `ge = ge_pv + ge_bat`); **`bd + ge_bat ≤ asset_battery.max_discharge_power_w`** (vybíjení do domu + export z baterie nesmí současně překročit BMS). Dříve LP dovoloval import+nabíjení a dvojnásobné nabíjení; u prodeje hrozilo současné `bd` a `ge_bat` až 2× max discharge — viz `SitePowerCapTests`. - **Hodnota FVE (PV store value):** tvrdé `ge_pv = 0` jen pokud `sell < future_sell_opportunity − degradation` **a** `sell < 0` (spot), nebo u fixního tarifu dle `fixed_pv_b_export_cap`. Při **`sell ≥ 0` (spot home-01, KV1):** `ge_pv` **neblokuje** pv_store — solver volí export vs. `bc_pv` podle `−ge_pv×sell` a degradace; **baterii** na večerní peak drží `ge_bat` (`evening_early` / push), ne curtail FVE. **v31:** při `sell ≥ 0` + PV přebytek **není** plný `ge_bat` push z `pre_neg_buy_discharge` / ranních shortfallů (export cap pro FVE). **Před prvním `sell < 0`:** `allow_pre_neg_pv_export`. Tag `2026-05-28-morning-pv-export-priority-v31`. Testy `Home01PvStoreValueTests`, `PreNegativeSellExportTests`. - **BA81 úsvit + MI (v51):** `fixed_pv_b_export_cap` (`ge_pv ≤ pv_b`) jen pokud **`pv_a_forecast ≥ 1500 W`** (`DAWN_LOW_PV_NO_CURTAIL_W`); při slabším A + přebytku → `fixed_mi_low_pv_surplus_export` (bez pv_store bloku). Exporter: při `forecast < 1500` a bez curtail A → **bez reg 340** (`setpoints.py`). Tag `2026-05-31-ba81-dawn-no-micro-curtail-v51`. Test `test_ba81_dawn_low_pv_no_full_curtail_for_mi_cap`. - - **Fixní tarif — PV export vs. nabíjení (v58):** `fixed_horizon_min_sell` z horizontu; při **`sell > min_sell + 0,20`** a PV přebytku → **`bc_pv = 0`**, **`bc_gi = 0`**, neblokovat `ge_pv` (ráno ~3 Kč export, poledne ~1,5 Kč nabíjení). Profitable `sell > buy` v noci: výjimka z `evening_early` + `peak_export_shortfall`. Tag `2026-06-01-fixed-pv-export-min-sell-charge-v58`. Testy `fixed_high_sell_no_pv_charge`. + - **Fixní tarif — PV export vs. nabíjení (v58–v59):** v58: při **`sell > min_sell + 0,20`** a PV přebytku → **`bc_pv = 0`**, export FVE; profitable noc **`sell > buy`** mimo `evening_early`. v59: **`bc_gi = 0`** i bez FVE při **`sell < buy`** nebo **`sell > min_sell + 0,20`**; večerní push bez nabíjení; **`R__063`** grid maska podle nejnižšího sell (`sell ASC`), ne `slot_ord`. Tagy `…-v58`, `…-v59`. - **Drahý nákup → vlastní spotřeba z baterie:** mimo `allow_charge` platí `bd + pv_ld ≥ load_baseline + hp[t]` a `gi ≤ EV + hp[t]` (ne `hp_rated`). **Spot:** drahý slot = `buy > min(buy≥0) + degradace`. **Fixní nákup (DB `purchase_pricing_mode=fixed` nebo heuristika rozptylu buy < 0,25):** navíc `buy > charge_acquisition + degradace`. Na spotu **nesmí** `charge_acquisition` (~0,9 Kč) označit všechny sloty jako drahé → Infeasible (home-01). Při **Infeasible** solver jednou opakuje s `relaxed_expensive_import` (síť smí krmit baseload v drahých slotech; v `solver_params.inputs.relaxed_expensive_import=true`). Testy `AutoPassiveSelfConsumptionTests`, `test_spot_low_acquisition_does_not_mark_all_slots_expensive`, `test_negative_buy_in_horizon_does_not_block_all_grid_import`. - **Záporný výkup (`sell < 0`) bez exportu:** `block_export_on_negative_sell` (KV1) **nebo** `purchase_pricing_mode=fixed` (BA81). **Spot (home-01):** `ge_pv=0` dokud není plná baterie; při plné jen ventil pole B (`ge_pv ≤ pv_b`, `w_pv_b_vent_neg`); výboj baterie při `sell<0` jen **12 slotů** před `buy ≤ planner_extreme_buy_threshold` (default −2), pokud spread do budoucna dává smysl — tag `2026-05-26-neg-sell-bat-dump-extreme-buy-v11`. Večerní discharge maska u spotu: denní peak ≥17:00 (ne `sell > ref_buy` v slotu). **v50:** u **KV1** při `sell≥0` a PV přebytku >500 W i **po** 1. `sell<0` → `ge_pv` (PV_SURPLUS), ne tvrdý `ge_bat` z večerního peak/push. - **Pole B při sell<0 (home-01):** pokud `block_export_on_negative_sell = false`, LP nesmí vynutit `ge_pv = 0` (přebytek neriťitelného PV B). KV1 s `block_export = true` jen curtail A / nabíjení. @@ -134,9 +134,11 @@ flowchart TD 12. **v57 — večerní push po rei:** `relaxed_expensive_import` **nesmí** vymazat `evening_push_ts`; tvrdý `ge_bat` push vypnut jen při `relaxed_neg_prep_window`. Tag **`2026-06-01-evening-push-keep-on-relaxed-import-v57`**. -13. **v58 — fixní tarif PV vs. nabíjení (BA81/KV1):** `fixed_horizon_min_sell`; při **`sell > min + 0,20`** → **`bc_pv = 0`**, **`bc_gi = 0`**, export FVE; profitable noc **`sell > buy`** mimo `evening_early` + shortfall. Tag **`2026-06-01-fixed-pv-export-min-sell-charge-v58`**. +13. **v58 — fixní tarif PV vs. nabíjení (BA81/KV1):** `fixed_horizon_min_sell`; při **`sell > min + 0,20`** + PV → **`bc_pv = 0`**, export FVE; profitable noc **`sell > buy`** mimo `evening_early`. Tag **`2026-06-01-fixed-pv-export-min-sell-charge-v58`**. -**Funkce:** … home-01 **v57**; BA81/KV1 fixed **v58**. +14. **v59 — fixní grid jen u min sell:** `bc_gi = 0` při **`sell < buy`** nebo **`sell > min + 0,20`**; push bez charge; **`R__063`** `sell ASC`. Tag **`2026-06-01-fixed-grid-charge-min-sell-v59`**. + +**Funkce:** … home-01 **v57**; BA81/KV1 fixed **v59** (+ `R__063`). ### Arbitráž baterie — účtování mezi sloty (povinné čtení) diff --git a/docs/planning-changelog.md b/docs/planning-changelog.md index 68065b4..aa79276 100644 --- a/docs/planning-changelog.md +++ b/docs/planning-changelog.md @@ -5,6 +5,23 @@ Formát: **datum (ISO)** · stručný důvod · soubory · chování / ověřen --- +## 2026-06-01 — BA81/KV1: zákaz grid nabíjení mimo min sell + večer bez charge (v59) + +**Problém (po v58):** **KV1** po večerním vývozu **22:00–22:15** nabíjel ze sítě za **buy ~6,35 Kč** (`allow_charge` z `R__063` podle `slot_ord`, ne nejnižší sell). **BA81** v špičce **sell ~9,6** částečně **nabíjela** (`allow_charge` + PV), místo čistého vývozu; **03:30** grid nabíjení před východem slunce. + +**Příčina v58:** `bc_gi = 0` jen při `pv_surplus > 500 W` — v noci prázdné, grid nabíjení projde. + +**Změna (v59):** +- LP: **`fixed_grid_charge_unprofitable`** — `bc_gi = 0` když `sell < buy + degrad` **nebo** `sell > min_sell + 0,20` (bez podmínky na FVE). +- LP: v **`evening_push_ts`** při `sell > buy` → `bc_pv = bc_gi = 0` (jen vývoz). +- **`R__063`:** u fixního tarifu grid sloty jen kde `sell ≤ min(sell≥0) + degrad + 0,05`, řazení **`sell_price ASC`** (ne `slot_ord`). + +Tag **`2026-06-01-fixed-grid-charge-min-sell-v59`**. + +**Ověření:** `pytest … -k "fixed_no_grid_charge or fixed_evening_push_no_charge"`; po deployi Flyway + backend replan KV1/BA81. + +--- + ## 2026-06-01 — BA81/KV1: FVE export při vysokém sell, nabíjení u min sell (v58) **Problém:** U **`purchase_pricing_mode=fixed`** (BA81 buy ~3,09 Kč, KV1 ~6,35 Kč) oproti home-01 (spot):