fix solveru
Some checks failed
CI and deploy / migration-check (push) Failing after 16s
CI and deploy / deploy (push) Has been skipped

This commit is contained in:
Dusan Vojacek
2026-05-24 11:45:10 +02:00
parent fb0d947af6
commit a3c4af3573
4 changed files with 83 additions and 12 deletions

View File

@@ -59,7 +59,7 @@ NEG_SELL_CURTAIL_PENALTY_CZK_KWH = 1.0
NEG_SELL_PV_CHARGE_REWARD_CZK_KWH = 0.8
# Měkký tlak: v okně sell<0 dobít na soc_max (ne zastavit na ~94 % kvůli curtail).
NEG_SELL_SOC_UNDERFILL_PENALTY_CZK_PER_WH = 0.35
PLANNER_BUILD_TAG = "2026-05-24-ba81-pv-b-export-v5"
PLANNER_BUILD_TAG = "2026-05-24-ba81-gen-cutoff-v6"
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
@@ -1607,11 +1607,12 @@ def solve_dispatch(
)
if block_pv_export_neg_sell:
prob += ge_pv[t] == 0
# Tvrdý zákaz celého vývozu (GEN / fixní nákup bez pole B).
# Tvrdý zákaz vývozu jen při block_export_on_negative_sell (KV1).
# GEN cut-off (z_gen_cutoff) nesmí vynutit ge==0 — jinak nelze odvést pole B při plné baterii (BA81).
block_neg_sell_export = bool(
getattr(grid, "block_export_on_negative_sell", False)
)
if z_gen_cutoff is not None or block_neg_sell_export:
if block_neg_sell_export:
prob += ge[t] == 0
prob += ge_pv[t] == 0
prob += ge_bat[t] == 0
@@ -1812,7 +1813,10 @@ def solve_dispatch(
and not getattr(grid, "block_export_on_negative_sell", False)
)
if fixed_pv_b_export_cap:
prob += ge_pv[t] <= max(0.0, float(s.pv_b_forecast_w))
if z_gen_cutoff is not None:
prob += ge_pv[t] <= float(s.pv_b_forecast_w) * (1 - z_gen_cutoff[t])
else:
prob += ge_pv[t] <= max(0.0, float(s.pv_b_forecast_w))
if (
not allow_pre_neg_pv_export
and not skip_pv_store_block