Branch 5: dynamický terminal SoC factor při future neg buy
Some checks failed
CI and deploy / migration-check (push) Failing after 15s
CI and deploy / deploy (push) Has been skipped

This commit is contained in:
Dusan Vojacek
2026-06-06 22:38:05 +02:00
parent 0f7dc6ed94
commit 36cb06b9d0
4 changed files with 179 additions and 10 deletions

View File

@@ -91,8 +91,11 @@ NEG_EVENING_PREP_DISCHARGE_SHORTFALL_PENALTY_CZK_KWH = 120.0
# Kotva: SoC na konci večera D1 a těsně před 1. sell<0 ráno D ≤ reserve_soc.
NEG_EVENING_RESERVE_SOC_MAX_SLACK_WH = 400.0
NEG_EVENING_RESERVE_SOC_SLACK_PENALTY_CZK_PER_WH = 55.0
# Terminal SoC shadow price: při blízkém buy<0 nesmí LP „šetřit“ baterii ve večerní špičce.
FUTURE_NEG_BUY_TERMINAL_SOC_FACTOR_MULT = 0.1
# Terminal SoC shadow price: effective_factor = base × (1 w_neg); w_neg roste s blízkostí a záporností buy<0.
TERMINAL_NEG_BUY_WEIGHT_HORIZON_SLOTS = int(36 / INTERVAL_H)
TERMINAL_NEG_BUY_MAGNITUDE_REF_CZK = 1.0
TERMINAL_NEG_BUY_MAGNITUDE_FLOOR = 0.25
TERMINAL_NEG_BUY_WEIGHT_CAP = 0.95
# Před prvním sell<0: export FVE jen pokud predikce v sell<0 okně pokryje dobítí na prep cíl.
PRE_NEG_PV_EXPORT_FORECAST_MARGIN = 1.15
PRE_NEG_PV_EXPORT_MIN_NEEDED_WH = 2500.0
@@ -1388,6 +1391,38 @@ def _first_neg_sell_idx_on_prague_day(
return None
def _terminal_neg_buy_weight(
slots: list[PlanningSlot],
*,
first_neg_buy_idx: int | None,
) -> float:
"""
w_neg ∈ [0, TERMINAL_NEG_BUY_WEIGHT_CAP]: snížení terminal SoC shadow price při buy<0 v horizontu.
Blížší a zápornější okno → vyšší váha; effective_factor = planner_terminal_soc_value_factor × (1 w_neg).
"""
if first_neg_buy_idx is None or first_neg_buy_idx <= 0:
return 0.0
slots_ahead = first_neg_buy_idx
prox = max(
0.0,
1.0 - slots_ahead / TERMINAL_NEG_BUY_WEIGHT_HORIZON_SLOTS,
)
if prox <= 0.0:
return 0.0
window_end = min(len(slots), first_neg_buy_idx + int(24 / INTERVAL_H))
neg_buys = [
float(slots[t].buy_price)
for t in range(first_neg_buy_idx, window_end)
if float(slots[t].buy_price) < 0.0
]
if not neg_buys:
return 0.0
min_neg_buy = min(neg_buys)
mag_raw = min(1.0, abs(min_neg_buy) / TERMINAL_NEG_BUY_MAGNITUDE_REF_CZK)
mag = TERMINAL_NEG_BUY_MAGNITUDE_FLOOR + (1.0 - TERMINAL_NEG_BUY_MAGNITUDE_FLOOR) * mag_raw
return min(TERMINAL_NEG_BUY_WEIGHT_CAP, prox * mag)
def _future_neg_buy_discharge_enabled(
slots: list[PlanningSlot],
battery: Any,
@@ -2802,9 +2837,11 @@ def solve_dispatch(
neg_sell_soc_target_by_t if neg_sell_phases_en else None
),
)
terminal_factor = terminal_factor_base
if future_neg_buy_discharge_en:
terminal_factor *= FUTURE_NEG_BUY_TERMINAL_SOC_FACTOR_MULT
terminal_neg_buy_weight = _terminal_neg_buy_weight(
slots,
first_neg_buy_idx=first_neg_buy_idx,
)
terminal_factor = terminal_factor_base * (1.0 - terminal_neg_buy_weight)
# Kč/Wh: ocenění energie ponechané v baterii na konci horizontu (receding horizon kotva).
terminal_soc_kcz_per_wh = avg_buy_terminal * terminal_factor / 1000.0
@@ -4903,6 +4940,7 @@ def solve_dispatch(
),
"evening_push_hard_suppressed": bool(evening_push_hard_suppressed),
"future_neg_buy_discharge": bool(future_neg_buy_discharge_en),
"terminal_neg_buy_weight": float(terminal_neg_buy_weight),
"terminal_soc_factor_effective": float(terminal_factor),
"pos_sell_pre_neg_buy_ge_exempt_slots": [
slots[i].interval_start.isoformat()