fix maxu u baterky pri prodeji
This commit is contained in:
@@ -1018,6 +1018,8 @@ def solve_dispatch(
|
||||
|
||||
# Součet nabíjení z FVE + ze sítě nesmí překročit max_charge_power_w baterie.
|
||||
prob += bc_pv[t] + bc_gi[t] <= battery.max_charge_power_w
|
||||
# Vybíjení do domu (bd) + export z baterie (ge_bat) sdílí jeden BMS limit.
|
||||
prob += bd[t] + ge_bat[t] <= battery.max_discharge_power_w
|
||||
# Breaker: import ze site je tvrdě omezen (gi_over jen numerická pojistka).
|
||||
prob += gi[t] <= gi_upper
|
||||
|
||||
|
||||
@@ -1838,6 +1838,59 @@ class SitePowerCapTests(unittest.TestCase):
|
||||
)
|
||||
self.assertGreater(r.battery_setpoint_w, 0)
|
||||
|
||||
def test_battery_export_respects_site_export_cap(self) -> None:
|
||||
"""SELL slot: vývoz ze site ≤ max_export; vybíjení baterie ≤ max_discharge."""
|
||||
base = datetime(2026, 5, 22, 18, 0, tzinfo=timezone.utc)
|
||||
slots = [
|
||||
PlanningSlot(
|
||||
interval_start=base,
|
||||
buy_price=0.5,
|
||||
sell_price=6.0,
|
||||
pv_a_forecast_w=0,
|
||||
pv_b_forecast_w=0,
|
||||
load_baseline_w=2500,
|
||||
ev1_connected=False,
|
||||
ev2_connected=False,
|
||||
is_predicted_price=False,
|
||||
allow_charge=False,
|
||||
allow_discharge_export=True,
|
||||
)
|
||||
]
|
||||
battery = _battery(uc_wh=64_000.0, min_pct=12.0, arb_pct=20.0)
|
||||
battery.max_charge_power_w = 18_000
|
||||
battery.max_discharge_power_w = 18_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=17_000, max_export_power_w=13_500)
|
||||
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.85 * battery.usable_capacity_wh
|
||||
results, _, _ = solve_dispatch(
|
||||
slots,
|
||||
battery,
|
||||
hp,
|
||||
grid,
|
||||
[None, None],
|
||||
vehicles,
|
||||
soc0,
|
||||
50.0,
|
||||
operating_mode="AUTO",
|
||||
)
|
||||
r = results[0]
|
||||
self.assertLessEqual(
|
||||
-r.grid_setpoint_w,
|
||||
13_500,
|
||||
msg="export ze site ≤ max_export_power_w",
|
||||
)
|
||||
self.assertLess(r.grid_setpoint_w, -500, msg="očekáván významný export")
|
||||
self.assertLess(r.battery_setpoint_w, -500, msg="očekáváno vybíjení baterie")
|
||||
self.assertLessEqual(
|
||||
r.export_limit_w,
|
||||
13_500,
|
||||
msg="export_limit_w odpovídá site limitu",
|
||||
)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
- **PV vrstva A:** jen pokud `sell ≥ future_sell_opportunity − degradation` (držet FVE na večerní peak, ne „nabíjet z FVE“ při nízkém sell).
|
||||
- **LP (AUTO):** objective explicitně `−ge_pv×sell − ge_bat×sell + ge_bat×acquisition` v exportních slotech; **bez** cross-slot vynucení `ge_pv ≥ surplus`. Guard FVE: `ge_pv=0` jen pokud `sell < charge_acquisition − degrad` (ne `sell < buy` ve slotu). Viz [`planning-arbitrage-accounting.md`](planning-arbitrage-accounting.md).
|
||||
- **Load-first (Deye, AUTO):** proměnné `pv_ld` (PV → load+EV+TČ), `pv_sp` (přebytek), `bc_pv` / `bc_gi`. Plná bilance `pv_a + pv_b + gi + bd = load + ev + hp + bc + ge`; `bc_pv + ge_pv ≤ pv_sp`; `gi ≤ load + bc_gi`; mimo `allow_discharge_export`: `bd ≤ load − pv_ld` a **`pv_ld ≥ load − gi − bd`**. Snapshot: `load_first_enabled=true`. Test `LoadFirstDispatchTests`.
|
||||
- **Tvrdé výkonové limity site/baterie:** `gi ≤ site_grid_connection.max_import_power_w` (breaker, ne měkká penalizace nad 17 kW); **`bc_pv + bc_gi ≤ asset_battery.max_charge_power_w`** (ne dva kanály po 18 kW). Dříve LP dovoloval `gi` až import+nabíjení a `battery_setpoint` až 2× max charge — viz `SitePowerCapTests`.
|
||||
- **Tvrdé výkonové limity site/baterie:** `gi ≤ site_grid_connection.max_import_power_w` (breaker); **`bc_pv + bc_gi ≤ asset_battery.max_charge_power_w`**; **`ge ≤ max_export_power_w`** (proměnná `ge`, platí `ge = ge_pv + ge_bat`); **`bd + ge_bat ≤ asset_battery.max_discharge_power_w`** (vybíjení do domu + export z baterie nesmí současně překročit BMS). Dříve LP dovoloval import+nabíjení a dvojnásobné nabíjení; u prodeje hrozilo současné `bd` a `ge_bat` až 2× max discharge — viz `SitePowerCapTests`.
|
||||
- **`ref_buy_min` (brána exportu):** `min(buy_price)` horizontu — jen „existuje levný nákup?“, **ne** průměrná cena nabití přes hodiny. Export sloty: `sell > ref_buy_min + degradation` (spot). Viz [`planning-arbitrage-accounting.md`](planning-arbitrage-accounting.md).
|
||||
- Pokud `energy_to_fill <= 0` nebo `charge_slot_buffer = 0`: všechny sloty povoleny.
|
||||
- **LP ekonomické guardy** (`solve_dispatch`, AUTO): `ge_pv=0` pokud `sell < charge_acquisition − degradation` (výjimka: plná baterie, přebytek **pv_b**). Pokud `buy > min(buy)+degradation` mimo charge masku → `gi` jen na load+EV+TČ. Viz `planning_engine.py` po slot pre-selection.
|
||||
|
||||
Reference in New Issue
Block a user