nerezta PV A pri prodeji z baterie
This commit is contained in:
Dusan Vojacek
@@ -68,7 +68,7 @@ NEG_BUY_CHARGE_SHORTFALL_PENALTY_CZK_KWH = 100.0
|
||||
PRE_NEG_CHARGE_PENALTY_CZK_KWH = 400.0
|
||||
PRE_NEG_BATT_EXPORT_SHORTFALL_PENALTY_CZK_KWH = 80.0
|
||||
PRE_NEG_BATT_EXPORT_MIN_SELL_CZK_KWH = 1.0
|
||||
PLANNER_BUILD_TAG = "2026-05-28-night-export-window-midnight-v30"
|
||||
PLANNER_BUILD_TAG = "2026-05-28-morning-pv-export-priority-v31"
|
||||
POS_SELL_PRE_NEG_SOC_SHORTFALL_PENALTY_CZK_PER_WH = 0.30
|
||||
PRE_NEG_BUY_SOC_CEILING_SLACK_PENALTY_CZK_PER_WH = 0.25
|
||||
PRE_NEG_BUY_EMPTY_EXPORT_SHORTFALL_PENALTY_CZK_KWH = 80.0
|
||||
@@ -971,6 +971,16 @@ def _slot_pv_surplus_w(slot: PlanningSlot) -> float:
|
||||
return max(0.0, pv_w - load_w)
|
||||
|
||||
|
||||
def _battery_export_push_defer_to_pv(slot: PlanningSlot) -> bool:
|
||||
"""
|
||||
Při kladném sell a PV přebytku nevnucovat plný ge_bat push (pre-neg / ranní větve).
|
||||
Exportní cap má pokrýt ge_pv; baterii řeší večerní push a sell<0 okna.
|
||||
"""
|
||||
if float(slot.sell_price) < 0.0:
|
||||
return False
|
||||
return _slot_pv_surplus_w(slot) > NIGHT_EXPORT_PV_SUNRISE_SURPLUS_W
|
||||
|
||||
|
||||
def _in_night_battery_export_window(slot: PlanningSlot) -> bool:
|
||||
"""
|
||||
Noční okno pro večerní push / peak sell: >=17h Prague, nebo 0–5h (přes půlnoc).
|
||||
@@ -1746,6 +1756,8 @@ def solve_dispatch(
|
||||
continue
|
||||
if t in evening_push_ts:
|
||||
continue
|
||||
if _battery_export_push_defer_to_pv(slots[t]):
|
||||
continue
|
||||
if not _slot_profitable_battery_export(
|
||||
slots[t],
|
||||
charge_acquisition_czk_kwh=charge_acquisition_czk_kwh,
|
||||
@@ -1761,9 +1773,13 @@ def solve_dispatch(
|
||||
peak_export_shortfall.append((t, sf, cap_w))
|
||||
export_cap_w = _battery_export_cap_w(battery, grid)
|
||||
for t_pnd in sorted(pre_neg_buy_discharge_ts):
|
||||
if _battery_export_push_defer_to_pv(slots[t_pnd]):
|
||||
continue
|
||||
sf_pnd = pulp.LpVariable(f"pre_neg_bat_export_sf_{t_pnd}", 0, export_cap_w)
|
||||
pre_neg_batt_export_shortfall.append((t_pnd, sf_pnd, export_cap_w))
|
||||
for t_empty in pre_neg_buy_empty_ts:
|
||||
if _battery_export_push_defer_to_pv(slots[t_empty]):
|
||||
continue
|
||||
sf_e = pulp.LpVariable(f"pre_neg_buy_empty_sf_{t_empty}", 0, export_cap_w)
|
||||
pre_neg_buy_empty_shortfall.append((t_empty, sf_e, export_cap_w))
|
||||
if not relaxed_neg_buy_charge:
|
||||
@@ -2032,11 +2048,17 @@ def solve_dispatch(
|
||||
export_push_w = _battery_export_cap_w(battery, grid)
|
||||
for t_peak in morning_pre_neg_export_ts:
|
||||
if t_peak in profitable_export_ts:
|
||||
if _battery_export_push_defer_to_pv(slots[t_peak]):
|
||||
continue
|
||||
prob += ge_bat[t_peak] >= export_push_w * z_export[t_peak]
|
||||
for t_pnd in pre_neg_buy_discharge_ts:
|
||||
if _battery_export_push_defer_to_pv(slots[t_pnd]):
|
||||
continue
|
||||
prob += ge_bat[t_pnd] >= export_push_w * z_export[t_pnd]
|
||||
for t_empty in pre_neg_buy_empty_ts:
|
||||
if t_empty in discharge_export_slots:
|
||||
if _battery_export_push_defer_to_pv(slots[t_empty]):
|
||||
continue
|
||||
prob += ge_bat[t_empty] >= export_push_w * z_export[t_empty]
|
||||
for t_early in sorted(evening_early_export_penalty_ts):
|
||||
prob += ge_bat[t_early] == 0
|
||||
|
||||
@@ -1410,7 +1410,7 @@ class NegativeSellPvChargeTests(unittest.TestCase):
|
||||
50.0,
|
||||
operating_mode="AUTO",
|
||||
)
|
||||
self.assertEqual(snap.get("planner_build_tag"), "2026-05-28-night-export-window-midnight-v30")
|
||||
self.assertEqual(snap.get("planner_build_tag"), "2026-05-28-morning-pv-export-priority-v31")
|
||||
self.assertGreater(
|
||||
results[0].battery_setpoint_w,
|
||||
2_500,
|
||||
@@ -1560,7 +1560,7 @@ class NegativeSellPvChargeTests(unittest.TestCase):
|
||||
50.0,
|
||||
operating_mode="AUTO",
|
||||
)
|
||||
self.assertEqual(snap.get("planner_build_tag"), "2026-05-28-night-export-window-midnight-v30")
|
||||
self.assertEqual(snap.get("planner_build_tag"), "2026-05-28-morning-pv-export-priority-v31")
|
||||
self.assertEqual(len(results), len(slots))
|
||||
|
||||
def test_gen_cutoff_full_soc_neg_sell_with_pv_b_feasible(self) -> None:
|
||||
@@ -1624,7 +1624,7 @@ class NegativeSellPvChargeTests(unittest.TestCase):
|
||||
55.0,
|
||||
operating_mode="AUTO",
|
||||
)
|
||||
self.assertEqual(snap.get("planner_build_tag"), "2026-05-28-night-export-window-midnight-v30")
|
||||
self.assertEqual(snap.get("planner_build_tag"), "2026-05-28-morning-pv-export-priority-v31")
|
||||
self.assertEqual(len(results), len(slots))
|
||||
|
||||
def test_fixed_tariff_neg_sell_no_grid_export(self) -> None:
|
||||
@@ -2310,7 +2310,7 @@ class ChargeAcquisitionArbitrageTests(unittest.TestCase):
|
||||
50.0,
|
||||
operating_mode="AUTO",
|
||||
)
|
||||
self.assertEqual(snap["planner_build_tag"], "2026-05-28-night-export-window-midnight-v30")
|
||||
self.assertEqual(snap["planner_build_tag"], "2026-05-28-morning-pv-export-priority-v31")
|
||||
peak_idx = sells.index(4.04)
|
||||
peak = results[peak_idx]
|
||||
self.assertIn(peak.export_mode, ("BATTERY_SELL", "PV_SURPLUS"))
|
||||
@@ -2388,7 +2388,7 @@ class ChargeAcquisitionArbitrageTests(unittest.TestCase):
|
||||
50.0,
|
||||
operating_mode="AUTO",
|
||||
)
|
||||
self.assertEqual(snap["planner_build_tag"], "2026-05-28-night-export-window-midnight-v30")
|
||||
self.assertEqual(snap["planner_build_tag"], "2026-05-28-morning-pv-export-priority-v31")
|
||||
r_midnight = results[2]
|
||||
self.assertEqual(r_midnight.export_mode, "BATTERY_SELL")
|
||||
self.assertGreaterEqual(abs(r_midnight.grid_setpoint_w), 12_500)
|
||||
@@ -2431,7 +2431,7 @@ class ChargeAcquisitionArbitrageTests(unittest.TestCase):
|
||||
50.0,
|
||||
operating_mode="AUTO",
|
||||
)
|
||||
self.assertEqual(snap["planner_build_tag"], "2026-05-28-night-export-window-midnight-v30")
|
||||
self.assertEqual(snap["planner_build_tag"], "2026-05-28-morning-pv-export-priority-v31")
|
||||
r = results[0]
|
||||
self.assertEqual(r.export_mode, "BATTERY_SELL")
|
||||
self.assertGreaterEqual(abs(r.grid_setpoint_w), 12_500)
|
||||
@@ -3173,6 +3173,51 @@ class PreNegativeSellExportTests(unittest.TestCase):
|
||||
class Home01PvStoreValueTests(unittest.TestCase):
|
||||
"""FVE: spot sell<0 → nabít/vent B; sell>=0 → LP volí export vs bc (ne tvrdý curtail)."""
|
||||
|
||||
def test_morning_pre_neg_discharge_exports_pv_not_full_curtail(self) -> None:
|
||||
"""07:00 archetyp: sell>0 + PV před buy<0 — FVE do sítě, ne plný ge_bat push + curtail."""
|
||||
prague = ZoneInfo("Europe/Prague")
|
||||
base = datetime(2026, 5, 26, 7, 0, tzinfo=prague)
|
||||
slots: list[PlanningSlot] = []
|
||||
for i in range(12):
|
||||
slots.append(
|
||||
PlanningSlot(
|
||||
interval_start=base + timedelta(minutes=15 * i),
|
||||
buy_price=5.9 if i == 0 else (0.9 if i < 8 else -0.5),
|
||||
sell_price=3.79 if i == 0 else (3.2 if i < 8 else -0.3),
|
||||
pv_a_forecast_w=629 if i == 0 else (3000 if i < 4 else 8000),
|
||||
pv_b_forecast_w=0,
|
||||
load_baseline_w=2000,
|
||||
ev1_connected=False,
|
||||
ev2_connected=False,
|
||||
allow_charge=False,
|
||||
allow_discharge_export=True,
|
||||
charge_acquisition_buy_czk_kwh=0.8,
|
||||
)
|
||||
)
|
||||
battery = _battery(uc_wh=64_000.0, min_pct=12.0, arb_pct=20.0)
|
||||
battery.max_discharge_power_w = 18_000
|
||||
battery.planner_terminal_soc_value_factor = 0.0
|
||||
battery.planner_daytime_charge_target_enabled = False
|
||||
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),
|
||||
]
|
||||
results, _, snap = solve_dispatch(
|
||||
slots, battery, hp, grid, [None, None], vehicles, 0.55 * battery.soc_max_wh, 50.0, operating_mode="AUTO"
|
||||
)
|
||||
self.assertEqual(snap["planner_build_tag"], "2026-05-28-morning-pv-export-priority-v31")
|
||||
r0 = results[0]
|
||||
self.assertLess(
|
||||
r0.pv_a_curtailed_w,
|
||||
500,
|
||||
"nesmí useknout celou FVE kvůli plnému ge_bat push (archetyp 07:00)",
|
||||
)
|
||||
self.assertNotEqual(r0.export_mode, "BATTERY_SELL")
|
||||
if r0.grid_setpoint_w < -500:
|
||||
self.assertEqual(r0.export_mode, "PV_SURPLUS")
|
||||
|
||||
def test_positive_sell_full_battery_exports_pv_not_curtail(self) -> None:
|
||||
"""Odpoledne sell ~3 Kč, večer ~6,6 — plná baterie: export FVE, ne pv_store curtail."""
|
||||
slots = [
|
||||
|
||||
@@ -131,7 +131,11 @@ Denní ekonomika v DB (`ems.fn_economics_daily_for_window`, repeatable `R__068_f
|
||||
|
||||
### Screening skript pro dimenzování baterie
|
||||
|
||||
Analytický skript `scripts/analysis/battery_sizing_screen.py` umí pro nákup v režimu spot simulovat dva užitečné screening režimy bez vazby na konkrétní `site_market_config`:
|
||||
Analytický skript `scripts/analysis/battery_sizing_screen.py` umí pro nákup v režimu spot simulovat screening režimy bez vazby na konkrétní `site_market_config` (kromě presetu home-01):
|
||||
|
||||
- **`--buy-home-01`:** stejná struktura jako `ems.fn_effective_buy_price` pro **home-01** dle živé `site_market_config` (ověř MCP): raw OTE ×**(1+9 %)** / ×**(1−9 %)** při záporné raw, + distribuce **NT 0,2243 / VT 0,74987** Kč/kWh dle HDO **09–10, 12–13, 16–17, 20–21**, + SS **0,192**, OTE **0,001**, DPH **×1,21**; prodej v EMS **`sell_margin_fixed = −0,30`** (ne −0,02 ze seedu).
|
||||
|
||||
Dále obecné režimy:
|
||||
|
||||
- `--buy-spot-add-fixed-kwh X`: základ nákupu = `raw_ote + X`
|
||||
- `--buy-spot-asym-pct P`: základ nákupu = `raw_ote × (1 + P/100)` pro `raw_ote >= 0`, resp. `raw_ote × (1 - P/100)` pro `raw_ote < 0`
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
- **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); **`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`.
|
||||
- **Hodnota FVE (PV store value):** tvrdé `ge_pv = 0` jen pokud `sell < future_sell_opportunity − degradation` **a** `sell < 0` (spot), nebo u fixního tarifu dle `fixed_pv_b_export_cap`. Při **`sell ≥ 0` (spot home-01, KV1):** `ge_pv` **neblokuje** pv_store — solver volí export vs. `bc_pv` podle `−ge_pv×sell` a degradace; **baterii** na večerní peak drží `ge_bat` (`evening_early` / push), ne curtail FVE. **Před prvním `sell < 0`:** `allow_pre_neg_pv_export`. Výjimka **nucený vent** jen plná baterie. Tag `2026-05-28-pv-positive-sell-solver-v29`. Testy `Home01PvStoreValueTests`, `PreNegativeSellExportTests`.
|
||||
- **Hodnota FVE (PV store value):** tvrdé `ge_pv = 0` jen pokud `sell < future_sell_opportunity − degradation` **a** `sell < 0` (spot), nebo u fixního tarifu dle `fixed_pv_b_export_cap`. Při **`sell ≥ 0` (spot home-01, KV1):** `ge_pv` **neblokuje** pv_store — solver volí export vs. `bc_pv` podle `−ge_pv×sell` a degradace; **baterii** na večerní peak drží `ge_bat` (`evening_early` / push), ne curtail FVE. **v31:** při `sell ≥ 0` + PV přebytek **není** plný `ge_bat` push z `pre_neg_buy_discharge` / ranních shortfallů (export cap pro FVE). **Před prvním `sell < 0`:** `allow_pre_neg_pv_export`. Tag `2026-05-28-morning-pv-export-priority-v31`. Testy `Home01PvStoreValueTests`, `PreNegativeSellExportTests`.
|
||||
- **Drahý nákup → vlastní spotřeba z baterie:** mimo `allow_charge` platí `bd + pv_ld ≥ load_baseline + hp[t]` a `gi ≤ EV + hp[t]` (ne `hp_rated`). **Spot:** drahý slot = `buy > min(buy≥0) + degradace`. **Fixní nákup (DB `purchase_pricing_mode=fixed` nebo heuristika rozptylu buy < 0,25):** navíc `buy > charge_acquisition + degradace`. Na spotu **nesmí** `charge_acquisition` (~0,9 Kč) označit všechny sloty jako drahé → Infeasible (home-01). Při **Infeasible** solver jednou opakuje s `relaxed_expensive_import` (síť smí krmit baseload v drahých slotech; v `solver_params.inputs.relaxed_expensive_import=true`). Testy `AutoPassiveSelfConsumptionTests`, `test_spot_low_acquisition_does_not_mark_all_slots_expensive`, `test_negative_buy_in_horizon_does_not_block_all_grid_import`.
|
||||
- **Záporný výkup (`sell < 0`) bez exportu:** `block_export_on_negative_sell` (KV1) **nebo** `purchase_pricing_mode=fixed` (BA81). **Spot (home-01):** `ge_pv=0` dokud není plná baterie; při plné jen ventil pole B (`ge_pv ≤ pv_b`, `w_pv_b_vent_neg`); výboj baterie při `sell<0` jen **12 slotů** před `buy ≤ planner_extreme_buy_threshold` (default −2), pokud spread do budoucna dává smysl — tag `2026-05-26-neg-sell-bat-dump-extreme-buy-v11`. Večerní discharge maska u spotu: denní peak ≥17:00 (ne `sell > ref_buy` v slotu).
|
||||
- **Pole B při sell<0 (home-01):** pokud `block_export_on_negative_sell = false`, LP nesmí vynutit `ge_pv = 0` (přebytek neriťitelného PV B). KV1 s `block_export = true` jen curtail A / nabíjení.
|
||||
|
||||
@@ -5,6 +5,14 @@ Formát: **datum (ISO)** · stručný důvod · soubory · chování / ověřen
|
||||
|
||||
---
|
||||
|
||||
## 2026-05-28 — Ráno: FVE do sítě místo plného ge_bat push (v31)
|
||||
|
||||
**Problém (run 17622, 07:00):** Při `sell ≥ 0` a PV přebytku `pre_neg_buy_discharge` vynutilo `ge_bat ≈ 13,5 kW` → exportní cap obsadila baterie → **celý curtail PV A** (v29 `ge_pv` sice povoleno, ale bez kapacity).
|
||||
|
||||
**Změna (tag `2026-05-28-morning-pv-export-priority-v31`):** `_battery_export_push_defer_to_pv` — u kladného sell + `pv > load + 500 W` se **neaplikuje** tvrdý/měkký push `ge_bat` z `pre_neg_buy_discharge`, `pre_neg_buy_empty`, `morning_pre_neg_export`, `peak_export_shortfall`. Večerní `evening_push` beze změny.
|
||||
|
||||
**Ověření:** `pytest … -k morning_pre_neg_discharge_exports_pv` · `planner_build_tag` **v31**.
|
||||
|
||||
## 2026-05-28 — Noční export přes půlnoc, konec při východu FVE (v30)
|
||||
|
||||
**Problém (home-01 run 17388):** Večerní peak **per kalendářní den** → export v **23:30** (3,29 Kč), slot **00:00** (3,59 Kč) bez `BATTERY_SELL` (nový den, hour < 17).
|
||||
|
||||
@@ -33,6 +33,10 @@ Příklad (čistá arbitráž, nákup = spot + fixní adder + distribuce/poplatk
|
||||
--buy-distribution-kwh 1.80 --buy-other-fees-kwh 0.20 --buy-vat-multiplier 1.21 \\
|
||||
... (ostatní jako výše)
|
||||
|
||||
Příklad (nákup jako home-01, prodej spot −0,30 dle živé DB):
|
||||
python3 scripts/analysis/battery_sizing_screen.py --db \\
|
||||
--buy-home-01 --sell-margin-fixed -0.30 ... (ostatní jako výše)
|
||||
|
||||
Vyžaduje: pip install pulp (volitelně psycopg2 pro --db).
|
||||
|
||||
Omezení modelu: FVE buď syntetický denní tvar (--pv-daily-kwh-*), nebo součet měsíčních
|
||||
@@ -81,6 +85,24 @@ class SiteLimits:
|
||||
soc_max_frac: float = 0.95
|
||||
|
||||
|
||||
# home-01 (živá DB site_market_config + V016 tarif/HDO): ověř MCP před změnou
|
||||
HOME01_BUY_MARGIN_FIXED_KWH = 0.0
|
||||
HOME01_BUY_MARGIN_PCT = 9.0
|
||||
HOME01_SYSTEM_SERVICES_KWH = 0.192
|
||||
HOME01_OTE_FEE_KWH = 0.001
|
||||
HOME01_DIST_NT_KWH = 0.2243
|
||||
HOME01_DIST_VT_KWH = 0.74987
|
||||
HOME01_VAT_MULTIPLIER = 1.21
|
||||
HOME01_SELL_MARGIN_FIXED_KWH = -0.30
|
||||
# VT okna Europe/Prague (každý den): 09–10, 12–13, 16–17, 20–21
|
||||
HOME01_VT_SLOT_MINUTES: tuple[tuple[int, int], ...] = (
|
||||
(9 * 60, 10 * 60),
|
||||
(12 * 60, 13 * 60),
|
||||
(16 * 60, 17 * 60),
|
||||
(20 * 60, 21 * 60),
|
||||
)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class BuyPricingConfig:
|
||||
mode: str = "flat"
|
||||
@@ -210,6 +232,35 @@ def effective_buy_spot_asym_pct_kc_kwh(raw_ote: float, asym_pct: float) -> float
|
||||
return raw_ote * (1.0 - asym_pct / 100.0)
|
||||
|
||||
|
||||
def slot_is_vt_home01(slot_index: int) -> bool:
|
||||
"""15min slot 0..95 od půlnoci (Europe/Prague) — VT okna jako u home-01 HDO."""
|
||||
mins = (slot_index // 4) * 60 + (slot_index % 4) * 15
|
||||
for start_m, end_m in HOME01_VT_SLOT_MINUTES:
|
||||
if start_m <= mins < end_m:
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def effective_buy_home01_kc_kwh(raw_ote: float, is_vt: bool) -> float:
|
||||
"""Stejná struktura jako ems.fn_effective_buy_price pro home-01 (spot, buy_margin_percent=0)."""
|
||||
dist = HOME01_DIST_VT_KWH if is_vt else HOME01_DIST_NT_KWH
|
||||
if HOME01_BUY_MARGIN_PCT != 0.0:
|
||||
if raw_ote >= 0:
|
||||
energy = raw_ote * (1.0 + HOME01_BUY_MARGIN_PCT / 100.0)
|
||||
else:
|
||||
energy = raw_ote * (1.0 - HOME01_BUY_MARGIN_PCT / 100.0)
|
||||
else:
|
||||
energy = raw_ote
|
||||
subtotal = (
|
||||
energy
|
||||
+ dist
|
||||
+ HOME01_SYSTEM_SERVICES_KWH
|
||||
+ HOME01_OTE_FEE_KWH
|
||||
+ HOME01_BUY_MARGIN_FIXED_KWH
|
||||
)
|
||||
return subtotal * HOME01_VAT_MULTIPLIER
|
||||
|
||||
|
||||
def build_buy_prices_96(raw_ote_96: Sequence[float], cfg: BuyPricingConfig) -> list[float]:
|
||||
fixed_fees_kwh = cfg.distribution_kwh + cfg.other_fees_kwh
|
||||
if cfg.mode == "spot_add_fixed":
|
||||
@@ -240,6 +291,11 @@ def build_buy_prices_96(raw_ote_96: Sequence[float], cfg: BuyPricingConfig) -> l
|
||||
cfg.nt_to_hour,
|
||||
)
|
||||
]
|
||||
if cfg.mode == "home01":
|
||||
return [
|
||||
effective_buy_home01_kc_kwh(px, slot_is_vt_home01(t))
|
||||
for t, px in enumerate(raw_ote_96)
|
||||
]
|
||||
if cfg.mode != "flat":
|
||||
raise ValueError(f"Neznámý buy mode: {cfg.mode}")
|
||||
return [(cfg.flat_kwh + fixed_fees_kwh) * cfg.vat_multiplier] * SLOTS_PER_DAY
|
||||
@@ -597,6 +653,11 @@ def main() -> None:
|
||||
default=None,
|
||||
help="Základ nákupu = raw OTE × (1 + p/100) pro raw >= 0, raw OTE × (1 - p/100) pro raw < 0",
|
||||
)
|
||||
ap.add_argument(
|
||||
"--buy-home-01",
|
||||
action="store_true",
|
||||
help="Nákup jako home-01 z živé DB (spot ×1.09/×0.91, dist NT/VT HDO, SS+OTE, DPH 21 %)",
|
||||
)
|
||||
ap.add_argument(
|
||||
"--buy-distribution-kwh",
|
||||
type=float,
|
||||
@@ -647,9 +708,13 @@ def main() -> None:
|
||||
args.buy_nt_kwh is not None,
|
||||
args.buy_spot_add_fixed_kwh is not None,
|
||||
args.buy_spot_asym_pct is not None,
|
||||
args.buy_home_01,
|
||||
]
|
||||
if sum(base_buy_modes) > 1:
|
||||
ap.error("Zvol jen jeden režim základu nákupu: flat, NT/VT, --buy-spot-add-fixed-kwh nebo --buy-spot-asym-pct")
|
||||
ap.error(
|
||||
"Zvol jen jeden režim nákupu: flat, NT/VT, --buy-spot-add-fixed-kwh, "
|
||||
"--buy-spot-asym-pct nebo --buy-home-01"
|
||||
)
|
||||
if args.buy_vat_multiplier <= 0:
|
||||
ap.error("--buy-vat-multiplier musí být > 0")
|
||||
if args.solver_time_limit_sec < 0:
|
||||
@@ -686,7 +751,9 @@ def main() -> None:
|
||||
if args.pvgis_csv:
|
||||
monthly_ed = merge_pvgis_monthly_ed_kwh([Path(p) for p in args.pvgis_csv])
|
||||
|
||||
if args.buy_spot_add_fixed_kwh is not None:
|
||||
if args.buy_home_01:
|
||||
buy_cfg = BuyPricingConfig(mode="home01")
|
||||
elif args.buy_spot_add_fixed_kwh is not None:
|
||||
buy_cfg = BuyPricingConfig(
|
||||
mode="spot_add_fixed",
|
||||
spot_add_fixed_kwh=args.buy_spot_add_fixed_kwh,
|
||||
@@ -762,6 +829,15 @@ def main() -> None:
|
||||
f" Nákup = raw OTE × (1 + {args.buy_spot_asym_pct}/100) pro raw >= 0, "
|
||||
f"raw OTE × (1 - {args.buy_spot_asym_pct}/100) pro raw < 0"
|
||||
)
|
||||
elif buy_cfg.mode == "home01":
|
||||
print(
|
||||
" Nákup = home-01 (MCP): raw OTE ×(1+9%) / ×(1-9%) + dist NT/VT dle HDO + "
|
||||
f"{HOME01_SYSTEM_SERVICES_KWH} SS + {HOME01_OTE_FEE_KWH} OTE, ×{HOME01_VAT_MULTIPLIER} DPH"
|
||||
)
|
||||
print(
|
||||
f" distribuce NT {HOME01_DIST_NT_KWH} / VT {HOME01_DIST_VT_KWH} Kč/kWh; "
|
||||
"VT 09–10, 12–13, 16–17, 20–21; prodej typicky sell_margin_fixed -0.30"
|
||||
)
|
||||
else:
|
||||
print(f" Nákup = flat {args.buy_vat_kwh} Kč/kWh")
|
||||
if args.buy_distribution_kwh or args.buy_other_fees_kwh:
|
||||
|
||||
Reference in New Issue
Block a user