next fix
This commit is contained in:
@@ -41,6 +41,9 @@ GE_MIN_EXPORT_W = 1.0
|
|||||||
# tento počet 15min slotů, držíme plánovací spodek na rezervě (arb_base_wh) místo planner floor —
|
# tento počet 15min slotů, držíme plánovací spodek na rezervě (arb_base_wh) místo planner floor —
|
||||||
# priorita: beze „ztráty na prodeji“ (sell >= 0) držet buffer, hluboký vývoz až těsně před záporným prodejem.
|
# 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
|
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
|
||||||
CORRECTION_WINDOW_H = 1 # hodina zpět pro výpočet korekčního faktoru
|
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_MIN_CLAMP = 0.5 # spodní limit korekčního faktoru
|
||||||
CORRECTION_MAX_CLAMP = 1.5 # horní limit korekčního faktoru
|
CORRECTION_MAX_CLAMP = 1.5 # horní limit korekčního faktoru
|
||||||
@@ -519,6 +522,8 @@ def solve_dispatch(
|
|||||||
ca = [pulp.LpVariable(f"ca_{t}", 0, slots[t].pv_a_forecast_w) for t in range(T)]
|
ca = [pulp.LpVariable(f"ca_{t}", 0, slots[t].pv_a_forecast_w) for t in range(T)]
|
||||||
hp = [pulp.LpVariable(f"hp_{t}", 0, heat_pump.rated_heating_power_w) for t in range(T)]
|
hp = [pulp.LpVariable(f"hp_{t}", 0, heat_pump.rated_heating_power_w) for t in range(T)]
|
||||||
soc_deficit_24h = pulp.LpVariable("soc_deficit_24h", 0, battery.usable_capacity_wh)
|
soc_deficit_24h = pulp.LpVariable("soc_deficit_24h", 0, battery.usable_capacity_wh)
|
||||||
|
soc_anchor_slack = None
|
||||||
|
t_anchor = None
|
||||||
|
|
||||||
# GEN port cut-off (BA81): binární proměnná pouze pokud je feature povolená v konfiguraci site/invertoru.
|
# GEN port cut-off (BA81): binární proměnná pouze pokud je feature povolená v konfiguraci site/invertoru.
|
||||||
gen_cutoff_enabled = bool(getattr(grid, "deye_gen_microinverter_cutoff_enabled", False))
|
gen_cutoff_enabled = bool(getattr(grid, "deye_gen_microinverter_cutoff_enabled", False))
|
||||||
@@ -547,6 +552,13 @@ def solve_dispatch(
|
|||||||
avg_buy_terminal * TERMINAL_SOC_VALUE_FACTOR / 1000.0
|
avg_buy_terminal * TERMINAL_SOC_VALUE_FACTOR / 1000.0
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Kotva: poslední slot před prvním sell<0 by měl končit u planner floor (pokud relaxace existuje).
|
||||||
|
# Slack penalizujeme v objective; samotné omezení přidáme až po definici soc.
|
||||||
|
first_neg_sell_idx = next((i for i, s in enumerate(slots) if float(s.sell_price) < 0), None)
|
||||||
|
if first_neg_sell_idx is not None and first_neg_sell_idx > 0 and floor_pct is not None:
|
||||||
|
t_anchor = first_neg_sell_idx - 1
|
||||||
|
soc_anchor_slack = pulp.LpVariable("soc_anchor_slack_wh", 0, float(battery.usable_capacity_wh))
|
||||||
|
|
||||||
# --- Účelová funkce (jen OTE sloty; terminal SoC shadow price na konci horizontu) ---
|
# --- Účelová funkce (jen OTE sloty; terminal SoC shadow price na konci horizontu) ---
|
||||||
prob += (
|
prob += (
|
||||||
pulp.lpSum(
|
pulp.lpSum(
|
||||||
@@ -564,9 +576,18 @@ def solve_dispatch(
|
|||||||
)
|
)
|
||||||
+ soc_deficit_24h * soc_deficit_penalty_czk_kwh / 1000
|
+ soc_deficit_24h * soc_deficit_penalty_czk_kwh / 1000
|
||||||
- terminal_soc_kcz_per_wh * soc[T - 1]
|
- terminal_soc_kcz_per_wh * soc[T - 1]
|
||||||
|
+ (
|
||||||
|
soc_anchor_slack * PRENEG_SELL_SOC_ANCHOR_SLACK_PENALTY_CZK_PER_WH
|
||||||
|
if soc_anchor_slack is not None
|
||||||
|
else 0
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
# --- Omezení ---
|
# --- Omezení ---
|
||||||
|
if t_anchor is not None and soc_anchor_slack is not None:
|
||||||
|
target_floor_wh = float(soc_min_series[t_anchor])
|
||||||
|
prob += soc[t_anchor] <= target_floor_wh + soc_anchor_slack
|
||||||
|
|
||||||
for t in range(T):
|
for t in range(T):
|
||||||
s = slots[t]
|
s = slots[t]
|
||||||
pv_a_net = s.pv_a_forecast_w - ca[t]
|
pv_a_net = s.pv_a_forecast_w - ca[t]
|
||||||
|
|||||||
@@ -519,6 +519,94 @@ class PlanningDispatchMilpTests(unittest.TestCase):
|
|||||||
# A zároveň nesmí být baterie ve výboji (dump musí proběhnout předtím).
|
# A zároveň nesmí být baterie ve výboji (dump musí proběhnout předtím).
|
||||||
self.assertGreaterEqual(results[1].battery_setpoint_w, 0)
|
self.assertGreaterEqual(results[1].battery_setpoint_w, 0)
|
||||||
|
|
||||||
|
def test_anchor_hits_floor_before_first_negative_sell(self) -> None:
|
||||||
|
"""
|
||||||
|
Pokud se v horizontu objeví první sell<0 a současně existuje planner floor (relaxace),
|
||||||
|
solver má skončit už v předchozím slotu u planner floor (cca 5 %), ne na ~15 %.
|
||||||
|
"""
|
||||||
|
base = datetime(2026, 4, 3, 6, 0, tzinfo=timezone.utc)
|
||||||
|
# Slot 0-1: sell >= 0; slot 2: první sell < 0; slot 3: extrémně záporný buy (motivace k bufferu).
|
||||||
|
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,
|
||||||
|
),
|
||||||
|
PlanningSlot(
|
||||||
|
interval_start=base + timedelta(minutes=45),
|
||||||
|
buy_price=-20.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,
|
||||||
|
),
|
||||||
|
]
|
||||||
|
battery = _battery(uc_wh=20_000.0, min_pct=10.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,
|
||||||
|
msg="anchor should drive SoC close to planner floor before first negative sell",
|
||||||
|
)
|
||||||
|
|
||||||
def test_grid_import_soft_cap_penalizes_breaker_overdraw(self) -> None:
|
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í.
|
Soft cap: solver může nominálně překročit breaker, ale jen pokud se to vyplatí.
|
||||||
|
|||||||
Reference in New Issue
Block a user