pry oprava uplne chybneho rizeni (prodaval za levneji nez nakoupil)
This commit is contained in:
@@ -707,6 +707,13 @@ def solve_dispatch(
|
|||||||
)
|
)
|
||||||
|
|
||||||
om = (operating_mode or "AUTO").strip().upper()
|
om = (operating_mode or "AUTO").strip().upper()
|
||||||
|
charge_slots: set[int] = set()
|
||||||
|
discharge_export_slots: set[int] = set()
|
||||||
|
if om == "AUTO":
|
||||||
|
charge_slots = {t for t, s in enumerate(slots) if s.allow_charge}
|
||||||
|
discharge_export_slots = {
|
||||||
|
t for t, s in enumerate(slots) if s.allow_discharge_export
|
||||||
|
}
|
||||||
# SELF_SUSTAIN dřív vynucoval ge[t] == 0, což umí udělat MILP infeasible v okamžiku, kdy:
|
# SELF_SUSTAIN dřív vynucoval ge[t] == 0, což umí udělat MILP infeasible v okamžiku, kdy:
|
||||||
# - baterie je na max SoC (nelze nabíjet),
|
# - baterie je na max SoC (nelze nabíjet),
|
||||||
# - PV pole B není curtailable,
|
# - PV pole B není curtailable,
|
||||||
@@ -939,14 +946,28 @@ def solve_dispatch(
|
|||||||
arb_cap_t = min(arb_t, soc_low_t)
|
arb_cap_t = min(arb_t, soc_low_t)
|
||||||
else:
|
else:
|
||||||
arb_cap_t = arb_t
|
arb_cap_t = arb_t
|
||||||
prob += soc_prev_expr >= (arb_cap_t - (arb_cap_t - soc_low_t) * (1 - w_arb[t]))
|
if om == "AUTO" and t not in discharge_export_slots:
|
||||||
prob += bd[t] <= (
|
# PASSIVE na střídači: EMS neplánuje vybíjení do load (Deye pokryje skutečnou zátěž).
|
||||||
s.load_baseline_w
|
pass
|
||||||
+ ev_total_t
|
elif om == "AUTO" and t in discharge_export_slots:
|
||||||
+ hp[t]
|
prob += soc_prev_expr >= (
|
||||||
+ bc[t]
|
arb_cap_t - (arb_cap_t - soc_low_t) * (1 - w_arb[t])
|
||||||
+ battery.max_discharge_power_w * w_arb[t]
|
)
|
||||||
)
|
prob += bd[t] <= (
|
||||||
|
battery.max_discharge_power_w * w_arb[t]
|
||||||
|
+ pulp.lpSum(ev_via_bat[e][t] for e in range(EV))
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
prob += soc_prev_expr >= (
|
||||||
|
arb_cap_t - (arb_cap_t - soc_low_t) * (1 - w_arb[t])
|
||||||
|
)
|
||||||
|
prob += bd[t] <= (
|
||||||
|
s.load_baseline_w
|
||||||
|
+ ev_total_t
|
||||||
|
+ hp[t]
|
||||||
|
+ bc[t]
|
||||||
|
+ battery.max_discharge_power_w * w_arb[t]
|
||||||
|
)
|
||||||
|
|
||||||
# Významný export ⇒ koncové SoC ≥ podlaha (viz soc_panel_min / arb_base).
|
# Významný export ⇒ koncové SoC ≥ podlaha (viz soc_panel_min / arb_base).
|
||||||
m_ge = float(grid.max_export_power_w)
|
m_ge = float(grid.max_export_power_w)
|
||||||
@@ -1001,18 +1022,12 @@ def solve_dispatch(
|
|||||||
|
|
||||||
# Slot pre-selection (z DB fn_load_planning_slots_full → allow_*)
|
# Slot pre-selection (z DB fn_load_planning_slots_full → allow_*)
|
||||||
if om == "AUTO":
|
if om == "AUTO":
|
||||||
charge_slots = {t for t, s in enumerate(slots) if s.allow_charge}
|
|
||||||
discharge_export_slots = {t for t, s in enumerate(slots) if s.allow_discharge_export}
|
|
||||||
for t in range(T):
|
for t in range(T):
|
||||||
if t not in charge_slots:
|
if t not in charge_slots:
|
||||||
prob += bc[t] == 0
|
prob += bc[t] == 0
|
||||||
|
|
||||||
if t not in discharge_export_slots:
|
if t not in discharge_export_slots:
|
||||||
s = slots[t]
|
prob += bd[t] == 0
|
||||||
ev_total_t = pulp.lpSum(
|
prob += w_arb[t] == 0
|
||||||
ev_direct[e][t] + ev_via_bat[e][t] for e in range(EV)
|
|
||||||
)
|
|
||||||
prob += bd[t] <= s.load_baseline_w + ev_total_t + hp[t]
|
|
||||||
|
|
||||||
# Deadline constraints pro EV
|
# Deadline constraints pro EV
|
||||||
for e, session in enumerate(ev_sessions):
|
for e, session in enumerate(ev_sessions):
|
||||||
@@ -1083,10 +1098,18 @@ def solve_dispatch(
|
|||||||
if grid_w < 0:
|
if grid_w < 0:
|
||||||
export_mode = "BATTERY_SELL" if batt_w < 0 else "PV_SURPLUS"
|
export_mode = "BATTERY_SELL" if batt_w < 0 else "PV_SURPLUS"
|
||||||
|
|
||||||
# Primární klasifikace fyzického režimu pro Deye: explicitně do plánu (Variant A).
|
# Deye: default PASSIVE (střídač pokryje load). CHARGE/SELL jen v maskovaných AUTO slotech.
|
||||||
# Default PASSIVE; SELL při export+vybíjení; CHARGE při import+nabíjení.
|
|
||||||
deye_mode = "PASSIVE"
|
deye_mode = "PASSIVE"
|
||||||
if batt_w < 0 and grid_w < 0:
|
if om == "AUTO":
|
||||||
|
if (
|
||||||
|
slots[t].allow_discharge_export
|
||||||
|
and batt_w < 0
|
||||||
|
and grid_w < 0
|
||||||
|
):
|
||||||
|
deye_mode = "SELL"
|
||||||
|
elif slots[t].allow_charge and batt_w > 0 and grid_w > 0:
|
||||||
|
deye_mode = "CHARGE"
|
||||||
|
elif batt_w < 0 and grid_w < 0:
|
||||||
deye_mode = "SELL"
|
deye_mode = "SELL"
|
||||||
elif batt_w > 0 and grid_w > 0:
|
elif batt_w > 0 and grid_w > 0:
|
||||||
deye_mode = "CHARGE"
|
deye_mode = "CHARGE"
|
||||||
|
|||||||
@@ -1009,6 +1009,71 @@ class PlanningDispatchMilpTests(unittest.TestCase):
|
|||||||
self.assertGreater(results[0].battery_setpoint_w, 0, "surplus PV should charge")
|
self.assertGreater(results[0].battery_setpoint_w, 0, "surplus PV should charge")
|
||||||
|
|
||||||
|
|
||||||
|
class AutoPassiveNoLoadFollowingDischargeTests(unittest.TestCase):
|
||||||
|
"""AUTO bez allow_discharge_export: žádné plánované vybíjení do load (Deye PASSIVE)."""
|
||||||
|
|
||||||
|
def test_no_battery_export_on_inflated_baseline_without_discharge_mask(self) -> None:
|
||||||
|
slots = [
|
||||||
|
PlanningSlot(
|
||||||
|
interval_start=datetime(2026, 5, 16, 9, 45, tzinfo=timezone.utc),
|
||||||
|
buy_price=0.77,
|
||||||
|
sell_price=0.09,
|
||||||
|
pv_a_forecast_w=0,
|
||||||
|
pv_b_forecast_w=0,
|
||||||
|
load_baseline_w=8542,
|
||||||
|
ev1_connected=False,
|
||||||
|
ev2_connected=False,
|
||||||
|
is_predicted_price=False,
|
||||||
|
allow_charge=False,
|
||||||
|
allow_discharge_export=False,
|
||||||
|
)
|
||||||
|
]
|
||||||
|
battery = _battery(uc_wh=20_000.0, min_pct=10.0, arb_pct=20.0)
|
||||||
|
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=17_000, max_export_power_w=8000)
|
||||||
|
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.45 * battery.usable_capacity_wh
|
||||||
|
results, _, _ = solve_dispatch(
|
||||||
|
slots,
|
||||||
|
battery,
|
||||||
|
hp,
|
||||||
|
grid,
|
||||||
|
[None, None],
|
||||||
|
vehicles,
|
||||||
|
soc0,
|
||||||
|
50.0,
|
||||||
|
tuv_delta_stats=None,
|
||||||
|
operating_mode="AUTO",
|
||||||
|
)
|
||||||
|
self.assertEqual(len(results), 1)
|
||||||
|
self.assertGreaterEqual(
|
||||||
|
results[0].battery_setpoint_w,
|
||||||
|
0,
|
||||||
|
msg="must not plan load-following discharge when allow_discharge_export=false",
|
||||||
|
)
|
||||||
|
self.assertEqual(results[0].deye_physical_mode, "PASSIVE")
|
||||||
|
self.assertGreaterEqual(
|
||||||
|
results[0].grid_setpoint_w,
|
||||||
|
0,
|
||||||
|
msg="must not export at a loss when discharge is disallowed",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class TerminalSocShadowTests(unittest.TestCase):
|
class TerminalSocShadowTests(unittest.TestCase):
|
||||||
"""Terminal SoC shadow price v objective drží konec horizontu nad holým minimem."""
|
"""Terminal SoC shadow price v objective drží konec horizontu nad holým minimem."""
|
||||||
|
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ declare
|
|||||||
v_reserve_wh numeric;
|
v_reserve_wh numeric;
|
||||||
v_daytime_en boolean;
|
v_daytime_en boolean;
|
||||||
v_night_buf_pct numeric;
|
v_night_buf_pct numeric;
|
||||||
|
v_degrad_czk_kwh numeric;
|
||||||
begin
|
begin
|
||||||
drop table if exists _ems_plan_slot_wk;
|
drop table if exists _ems_plan_slot_wk;
|
||||||
create temp table _ems_plan_slot_wk on commit drop as
|
create temp table _ems_plan_slot_wk on commit drop as
|
||||||
@@ -199,7 +200,8 @@ begin
|
|||||||
greatest(coalesce(ab.discharge_efficiency, 1::numeric), 0.0001::numeric),
|
greatest(coalesce(ab.discharge_efficiency, 1::numeric), 0.0001::numeric),
|
||||||
(ab.reserve_soc_percent / 100.0 * ab.usable_capacity_wh)::numeric,
|
(ab.reserve_soc_percent / 100.0 * ab.usable_capacity_wh)::numeric,
|
||||||
coalesce(ab.planner_daytime_charge_target_enabled, true),
|
coalesce(ab.planner_daytime_charge_target_enabled, true),
|
||||||
coalesce(ab.planner_night_baseload_buffer_percent, 20::numeric)
|
coalesce(ab.planner_night_baseload_buffer_percent, 20::numeric),
|
||||||
|
coalesce(ab.degradation_cost_czk_kwh, 0.15::numeric)
|
||||||
into
|
into
|
||||||
v_charge_buf,
|
v_charge_buf,
|
||||||
v_discharge_buf,
|
v_discharge_buf,
|
||||||
@@ -212,7 +214,8 @@ begin
|
|||||||
v_discharge_eff,
|
v_discharge_eff,
|
||||||
v_reserve_wh,
|
v_reserve_wh,
|
||||||
v_daytime_en,
|
v_daytime_en,
|
||||||
v_night_buf_pct
|
v_night_buf_pct,
|
||||||
|
v_degrad_czk_kwh
|
||||||
from ems.asset_battery ab
|
from ems.asset_battery ab
|
||||||
join ems.asset_inverter ai on ai.id = ab.inverter_id and ai.site_id = ab.site_id
|
join ems.asset_inverter ai on ai.id = ab.inverter_id and ai.site_id = ab.site_id
|
||||||
where ab.site_id = p_site_id
|
where ab.site_id = p_site_id
|
||||||
@@ -331,6 +334,7 @@ begin
|
|||||||
for r_slot in
|
for r_slot in
|
||||||
select wk.slot_ord
|
select wk.slot_ord
|
||||||
from _ems_plan_slot_wk wk
|
from _ems_plan_slot_wk wk
|
||||||
|
where wk.sell_price > wk.buy_price + v_degrad_czk_kwh
|
||||||
order by wk.sell_price desc, wk.slot_ord desc
|
order by wk.sell_price desc, wk.slot_ord desc
|
||||||
loop
|
loop
|
||||||
exit when v_cum >= v_discharge_target_wh;
|
exit when v_cum >= v_discharge_target_wh;
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
- měkký cíl na konci 24h přes `_soc_security_profile` + tvrdé dvouúrovňové pravidlo výše.
|
- měkký cíl na konci 24h přes `_soc_security_profile` + tvrdé dvouúrovňové pravidlo výše.
|
||||||
- **Dynamická ekonomická podlaha (fáze 2):**
|
- **Dynamická ekonomická podlaha (fáze 2):**
|
||||||
- `_dynamic_arb_floor_wh_series`: podle součtu FVE výkonu v dalších ~8 h (`ARB_LOOKAHEAD_SLOTS`) se `arb_floor_wh[t]` posouvá mezi `min_soc_wh` a rezervou z DB – silné očekávané slunce ji sníží (ráno / po obloze); vynutit konstantní chování lze `battery.disable_dynamic_arb_floor=True` jen pro testy / ladění.
|
- `_dynamic_arb_floor_wh_series`: podle součtu FVE výkonu v dalších ~8 h (`ARB_LOOKAHEAD_SLOTS`) se `arb_floor_wh[t]` posouvá mezi `min_soc_wh` a rezervou z DB – silné očekávané slunce ji sníží (ráno / po obloze); vynutit konstantní chování lze `battery.disable_dynamic_arb_floor=True` jen pro testy / ladění.
|
||||||
- **Výběr exportních slotů (`allow_discharge_export`):** `ems.fn_load_planning_slots_full` omezuje, ve kterých slotech smí solver vybíjet baterii „nad rámec spotřeby“ pro export do sítě (anti-mikrocyklování). Aktuálně se sloty pro exportní vybíjení vybírají **globálně** podle `sell_price desc` přes celé okno (ne 50/50 AM/PM), aby solver neodkládal vybíjení do levnějších ranních slotů, pokud jsou dražší sloty už večer.
|
- **Výběr exportních slotů (`allow_discharge_export`):** `ems.fn_load_planning_slots_full` označí jen sloty, kde smí solver **úmyslně** vybíjet baterii do sítě (SELL). Výběr je **globálně** podle `sell_price desc` (ne AM/PM 50/50) a jen kde `sell_price > buy_price + degradation_cost_czk_kwh` (žádný export se ztrátou). V `solve_dispatch` (AUTO): mimo tyto sloty platí **`bd[t] = 0`** a **`w_arb[t] = 0`** — EMS **neplánuje** vybíjení do predikovaného `load_baseline`; skutečnou zátěž v těch slotech pokrývá střídač v režimu **PASSIVE** (`deye_physical_mode`). **CHARGE** jen v `allow_charge` slotech s importem+nabíjením; **SELL** jen v `allow_discharge_export` s exportem+vybíjením.
|
||||||
- **Záporná nákupní cena:**
|
- **Záporná nákupní cena:**
|
||||||
- horní mez `grid_import` zahrnuje `load_baseline_w` + nabíjení/EV/TČ (bez nekonečného importu).
|
- horní mez `grid_import` zahrnuje `load_baseline_w` + nabíjení/EV/TČ (bez nekonečného importu).
|
||||||
- **Záporná prodejní cena → tvrdý zákaz vývozu (`ge = 0`)** (`planning_engine.solve_dispatch`): platí ve slotu kde `sell_price < 0`, pokud lokality zapne některou z opcí —
|
- **Záporná prodejní cena → tvrdý zákaz vývozu (`ge = 0`)** (`planning_engine.solve_dispatch`): platí ve slotu kde `sell_price < 0`, pokud lokality zapne některou z opcí —
|
||||||
|
|||||||
Reference in New Issue
Block a user