preorita nabijeni pred skrcenim

backend/services/planning_engine.py

@@ -52,7 +52,7 @@ 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 = 25.0
+PV_CHARGE_SHORTFALL_PENALTY_CZK_KWH = 50.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
@@ -1199,21 +1199,22 @@ def solve_dispatch(
             ))
             sf = pulp.LpVariable(f"export_shortfall_{t}", 0, cap_w)
             peak_export_shortfall.append((t, sf, cap_w))
-        if block_export_neg_sell:
-            for t in range(T):
-                if float(slots[t].sell_price) >= 0:
-                    continue
-                pv_surplus_w = max(
-                    0.0,
-                    float(slots[t].pv_a_forecast_w)
-                    + float(slots[t].pv_b_forecast_w)
-                    - float(slots[t].load_baseline_w),
-                )
-                if pv_surplus_w <= 0:
-                    continue
-                cap_w = float(min(pv_surplus_w, battery.max_charge_power_w))
-                sf_pv = pulp.LpVariable(f"pv_charge_shortfall_{t}", 0, cap_w)
-                pv_charge_shortfall.append((t, sf_pv, cap_w))
+        for t in range(T):
+            if float(slots[t].sell_price) >= 0:
+                continue
+            if t not in charge_slots:
+                continue
+            pv_surplus_w = max(
+                0.0,
+                float(slots[t].pv_a_forecast_w)
+                + float(slots[t].pv_b_forecast_w)
+                - float(slots[t].load_baseline_w),
+            )
+            if pv_surplus_w <= 500:
+                continue
+            cap_w = float(min(pv_surplus_w, battery.max_charge_power_w))
+            sf_pv = pulp.LpVariable(f"pv_charge_shortfall_{t}", 0, cap_w)
+            pv_charge_shortfall.append((t, sf_pv, cap_w))
 
     # --- Účelová funkce (jen OTE sloty; terminal SoC shadow price na konci horizontu) ---
     # Kanály: gi×buy, −ge_pv×sell, −ge_bat×sell, +ge_bat×acquisition (export bat. jen v discharge slotách).
@@ -1317,6 +1318,15 @@ 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))