fix infeasable
This commit is contained in:
@@ -1168,14 +1168,21 @@ def solve_dispatch(
|
||||
0.0,
|
||||
float(s.pv_a_forecast_w) + float(s.pv_b_forecast_w) - load_neg,
|
||||
)
|
||||
# FVE→síť při záporném výkupu jen nucený vent (plná baterie); jinak bc_pv / load-first.
|
||||
if not _pv_forced_vent_export_allowed(
|
||||
t,
|
||||
current_soc_wh=current_soc_wh,
|
||||
battery=battery,
|
||||
soc_headroom_wh=soc_headroom_wh,
|
||||
pv_surplus_w=pv_surplus_neg_w,
|
||||
):
|
||||
# FVE→síť při záporném výkupu: u KV1 (block_export) jen bc/curtail A;
|
||||
# u home-01 s polem B musí přebytek jít do sítě (ge_pv), jinak infeasible.
|
||||
block_pv_export_neg_sell = bool(
|
||||
getattr(grid, "block_export_on_negative_sell", False)
|
||||
) or (
|
||||
float(s.pv_b_forecast_w) <= 0
|
||||
and not _pv_forced_vent_export_allowed(
|
||||
t,
|
||||
current_soc_wh=current_soc_wh,
|
||||
battery=battery,
|
||||
soc_headroom_wh=soc_headroom_wh,
|
||||
pv_surplus_w=pv_surplus_neg_w,
|
||||
)
|
||||
)
|
||||
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).
|
||||
block_neg_sell_export = bool(
|
||||
@@ -1306,7 +1313,6 @@ def solve_dispatch(
|
||||
# Ekonomické guardy: ceny v objective nestačí proti maskám / terminal SoC.
|
||||
ref_buy_horizon = min(float(s.buy_price) for s in slots)
|
||||
min_spread = float(degradation_cost_effective)
|
||||
hp_rated_w = float(heat_pump.rated_heating_power_w)
|
||||
for t in range(T):
|
||||
s = slots[t]
|
||||
buy_t = float(s.buy_price)
|
||||
@@ -1330,8 +1336,13 @@ def solve_dispatch(
|
||||
and sell_t >= 0
|
||||
)
|
||||
pv_store_val = _pv_store_value_czk_kwh(s, min_spread)
|
||||
skip_pv_store_block = (
|
||||
float(s.pv_b_forecast_w) > 0
|
||||
and not getattr(grid, "block_export_on_negative_sell", False)
|
||||
)
|
||||
if (
|
||||
not allow_pre_neg_pv_export
|
||||
and not skip_pv_store_block
|
||||
and sell_t < pv_store_val
|
||||
and not _pv_forced_vent_export_allowed(
|
||||
t,
|
||||
@@ -1348,11 +1359,13 @@ def solve_dispatch(
|
||||
buy_t > charge_acquisition_czk_kwh + min_spread
|
||||
)
|
||||
if expensive_import_slot and t not in charge_slots:
|
||||
prob += gi[t] <= ev_cap_t + hp_rated_w
|
||||
# Síť jen pro EV + skutečný výkon TČ v tomto slotu (hp[t]), ne celý dům.
|
||||
prob += gi[t] <= ev_cap_t + hp[t]
|
||||
if om == "AUTO":
|
||||
# Bazál + TČ z baterie/FVE; hp[t] může být 0 — nesmí se použít hp_rated (infeasible).
|
||||
prob += (
|
||||
bd[t] + pv_ld[t]
|
||||
>= float(s.load_baseline_w) + hp_rated_w
|
||||
>= float(s.load_baseline_w) + hp[t]
|
||||
)
|
||||
# Anti souběžný vývoz FVE + významný import (mikrocyklus).
|
||||
if buy_t > sell_t + min_spread and pv_surplus_w > 0:
|
||||
|
||||
Reference in New Issue
Block a user