zas oprava KV1 a BA81

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)