fix
This commit is contained in:
@@ -42,8 +42,9 @@ GE_MIN_EXPORT_W = 1.0
|
||||
# priorita: beze „ztráty na prodeji“ (sell >= 0) držet buffer, hluboký vývoz až těsně před záporným prodejem.
|
||||
DEFAULT_PLANNER_DISCHARGE_RELAX_PREWINDOW_SLOTS = 8
|
||||
# Měkká kotva: chceme být u planner floor už v posledním slotu před prvním sell < 0.
|
||||
# Penalizace je v Kč/Wh (např. 0.02 = 20 Kč/kWh).
|
||||
PRENEG_SELL_SOC_ANCHOR_SLACK_PENALTY_CZK_PER_WH = 0.02
|
||||
# Penalizace je v Kč/Wh (např. 0.20 = 200 Kč/kWh). Musí být dost velká, aby přebila
|
||||
# bezpečnostní SoC buffer + terminal shadow cenu a solver skutečně „dovylil“ před sell<0.
|
||||
PRENEG_SELL_SOC_ANCHOR_SLACK_PENALTY_CZK_PER_WH = 0.20
|
||||
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
|
||||
@@ -462,6 +463,24 @@ def solve_dispatch(
|
||||
buy_extreme_thr = float(getattr(battery, "planner_extreme_buy_threshold_czk_kwh", -5.0))
|
||||
floor_pct_raw = getattr(battery, "planner_discharge_floor_percent", None)
|
||||
floor_pct = float(floor_pct_raw) if floor_pct_raw is not None else None
|
||||
prewin = max(
|
||||
0,
|
||||
int(
|
||||
getattr(
|
||||
battery,
|
||||
"planner_discharge_relax_prewindow_slots",
|
||||
DEFAULT_PLANNER_DISCHARGE_RELAX_PREWINDOW_SLOTS,
|
||||
)
|
||||
),
|
||||
)
|
||||
# Planner floor v Wh (nezávisle na lookahead extrémním buy) – použije se pro kotvu před sell<0.
|
||||
abs_min_wh = max(float(battery.usable_capacity_wh) * 0.05, 1.0)
|
||||
planner_floor_wh = (
|
||||
min_soc_wh
|
||||
if floor_pct is None
|
||||
else max(abs_min_wh, float(floor_pct) / 100.0 * float(battery.usable_capacity_wh))
|
||||
)
|
||||
planner_floor_effective_wh = min(min_soc_wh, float(planner_floor_wh))
|
||||
soc_min_series = _soc_min_wh_series(
|
||||
slots,
|
||||
float(battery.usable_capacity_wh),
|
||||
@@ -469,6 +488,16 @@ def solve_dispatch(
|
||||
buy_extreme_thr,
|
||||
floor_pct,
|
||||
)
|
||||
# Pokud se blíží první sell<0, dovol hluboký planner floor i bez extrémního buy.
|
||||
# Záměr: „dovylít“ baterii před záporným prodejem a pak už baterii v sell<0 okně nevybíjet.
|
||||
if floor_pct is not None:
|
||||
dist_to_neg_sell = _slots_until_sell_lt(slots, 0.0)
|
||||
soc_min_series = [
|
||||
min(float(sm), float(planner_floor_effective_wh))
|
||||
if dist_to_neg_sell[i] <= prewin
|
||||
else float(sm)
|
||||
for i, sm in enumerate(soc_min_series)
|
||||
]
|
||||
current_soc_wh = float(current_soc_wh)
|
||||
current_soc_wh = max(soc_min_series[0], min(current_soc_wh, float(battery.soc_max_wh)))
|
||||
arb_base_wh = max(
|
||||
@@ -481,17 +510,6 @@ def solve_dispatch(
|
||||
arb_floor_series = _dynamic_arb_floor_wh_series(
|
||||
slots, min_soc_wh, arb_base_wh, float(battery.usable_capacity_wh)
|
||||
)
|
||||
|
||||
prewin = max(
|
||||
0,
|
||||
int(
|
||||
getattr(
|
||||
battery,
|
||||
"planner_discharge_relax_prewindow_slots",
|
||||
DEFAULT_PLANNER_DISCHARGE_RELAX_PREWINDOW_SLOTS,
|
||||
)
|
||||
),
|
||||
)
|
||||
deferral_slots = _prewindow_deferral_slots(slots, buy_extreme_thr)
|
||||
soc_panel_min = _soc_panel_min_wh_series(
|
||||
soc_min_series,
|
||||
@@ -585,7 +603,8 @@ def solve_dispatch(
|
||||
|
||||
# --- Omezení ---
|
||||
if t_anchor is not None and soc_anchor_slack is not None:
|
||||
target_floor_wh = float(soc_min_series[t_anchor])
|
||||
# Cíl kotvy: skutečný planner floor (5 %), ne lookahead-driven soc_min_series.
|
||||
target_floor_wh = float(planner_floor_effective_wh)
|
||||
prob += soc[t_anchor] <= target_floor_wh + soc_anchor_slack
|
||||
|
||||
for t in range(T):
|
||||
|
||||
@@ -607,6 +607,77 @@ class PlanningDispatchMilpTests(unittest.TestCase):
|
||||
msg="anchor should drive SoC close to planner floor before first negative sell",
|
||||
)
|
||||
|
||||
def test_anchor_uses_planner_floor_even_without_extreme_buy(self) -> None:
|
||||
"""
|
||||
Regrese: pokud v horizontu není buy <= threshold (soc_min_series by se nerelaxovala),
|
||||
kotva před sell<0 má stejně mířit na planner floor (5 %), ne na base min SoC.
|
||||
"""
|
||||
base = datetime(2026, 4, 3, 6, 0, tzinfo=timezone.utc)
|
||||
slots = [
|
||||
PlanningSlot(
|
||||
interval_start=base,
|
||||
buy_price=3.0,
|
||||
sell_price=1.0,
|
||||
pv_a_forecast_w=0,
|
||||
pv_b_forecast_w=0,
|
||||
load_baseline_w=0,
|
||||
ev1_connected=False,
|
||||
ev2_connected=False,
|
||||
allow_charge=True,
|
||||
allow_discharge_export=True,
|
||||
),
|
||||
PlanningSlot(
|
||||
interval_start=base + timedelta(minutes=15),
|
||||
buy_price=3.0,
|
||||
sell_price=0.5,
|
||||
pv_a_forecast_w=0,
|
||||
pv_b_forecast_w=0,
|
||||
load_baseline_w=0,
|
||||
ev1_connected=False,
|
||||
ev2_connected=False,
|
||||
allow_charge=True,
|
||||
allow_discharge_export=True,
|
||||
),
|
||||
PlanningSlot(
|
||||
interval_start=base + timedelta(minutes=30),
|
||||
buy_price=3.0,
|
||||
sell_price=-0.2,
|
||||
pv_a_forecast_w=0,
|
||||
pv_b_forecast_w=0,
|
||||
load_baseline_w=0,
|
||||
ev1_connected=False,
|
||||
ev2_connected=False,
|
||||
allow_charge=True,
|
||||
allow_discharge_export=True,
|
||||
),
|
||||
]
|
||||
battery = _battery(uc_wh=20_000.0, min_pct=12.0, arb_pct=20.0)
|
||||
battery.planner_extreme_buy_threshold_czk_kwh = -2.0
|
||||
battery.planner_discharge_floor_percent = 5.0
|
||||
battery.max_charge_power_w = 50_000
|
||||
battery.max_discharge_power_w = 50_000
|
||||
hp = SimpleNamespace(rated_heating_power_w=0, tuv_min_temp_c=45.0, tuv_target_temp_c=55.0)
|
||||
grid = SimpleNamespace(max_import_power_w=50_000, max_export_power_w=50_000)
|
||||
vehicles = [
|
||||
SimpleNamespace(max_charge_power_w=0, battery_capacity_kwh=1.0, default_target_soc_pct=80.0),
|
||||
SimpleNamespace(max_charge_power_w=0, battery_capacity_kwh=1.0, default_target_soc_pct=80.0),
|
||||
]
|
||||
soc0 = 0.9 * battery.usable_capacity_wh
|
||||
results, _ms = solve_dispatch(
|
||||
slots,
|
||||
battery,
|
||||
hp,
|
||||
grid,
|
||||
[None, None],
|
||||
vehicles,
|
||||
soc0,
|
||||
50.0,
|
||||
tuv_delta_stats=None,
|
||||
operating_mode="AUTO",
|
||||
)
|
||||
# Slot index 1 je poslední před prvním sell<0 (index 2).
|
||||
self.assertLessEqual(results[1].battery_soc_target, 6.0)
|
||||
|
||||
def test_grid_import_soft_cap_penalizes_breaker_overdraw(self) -> None:
|
||||
"""
|
||||
Soft cap: solver může nominálně překročit breaker, ale jen pokud se to vyplatí.
|
||||
|
||||
Reference in New Issue
Block a user