OPT-36: Leftover solar counts Cheap hours and Solar first batteries before buying #229

Merged

admin merged 8 commits from OPT-36 into hotfix-0.20.1 2026-11-02 14:49:46 +01:00

Conversation 2 Commits 8 Files Changed 14

+1193 -65

8 Commits

Author	SHA1	Message	Date
glenn schrooyenandClaude	eb9ccc2730	OPT-36 round 4: count only charge control will make; Solar first drain at the night base ... Review F1: a slot after B's run counts only if no slot from the expensive hours on is cheaper (control plans B's charge left in the cheapest window ahead), and x 0.95 of B's charge is stored. Three-price night: 1ac7fe9 left the expensive hours 2.61 kWh short; now 0. Review F2: a Solar first battery's drain until the expensive hours reads each hour at no less than the night base (the profile is net of the sun). Read net, a dark morning drained the battery the plan still counted; A's level fell, the cheap run moved and was lost before it started (+0.40 EUR per 3 days). The two real-price replays now cost what 0.20.0 does. F3: the ux54 sweep's peak limit is 15 kW (the option's top). F4: the rest comes from the grid (EN/NL). F5: CHANGELOG and DECISIONS wording. Co-Authored-By: Claude <noreply@anthropic.com>	2026-11-02 12:56:17 +01:00
glenn schrooyenandClaude	1ac7fe98d7	OPT-36 round 3: test_opt36 reads the mid_flat level through nth() ... Co-Authored-By: Claude <noreply@anthropic.com>	2026-11-02 10:57:22 +01:00
glenn schrooyenandClaude	e4b9dee699	OPT-36 round 3: B's charge counts the cheap time left; OPT-34 nights on their own shapes ... The run is sized at the batteries' ratings, not the peak limit, so a run too short to fill a Cheap hours battery is planned again later in the night. Counting that run alone made B's give grow through the night and A's level fall after A had bought (round 2: 55 -> 69 -> 41 -> 37 %, A to 56 %). dayplan._cheap_give_kwh() now also counts the later firm slots before the expensive hours that a run would still be worth charging in (price + the spread control asks at most the give run's dearest slot); the Controller passes the slots and the spread. test_opt34: back to the original house shapes, fixture and expected values. B is Off in the nights that test A's level (a Cheap hours B now covers these hours); B's checks run in new `_b` nights; the 03:00 check runs in a night from midnight; tail starts A at 60 %; late_fresh reads the kept 6.0. test_opt36: slot cases, a whole night on one figure (level never moves), F-1 with B counted (raised level reached and held). test_ux54: the run end is read from the plan and asserted (02:30); the F1/F2 sweep uses a peak limit that does not bind and reads a level shown as the target as at it. Co-Authored-By: Claude <noreply@anthropic.com>	2026-11-02 10:15:20 +01:00
glenn schrooyenandClaude	3a18475a5a	OPT-36 round 2: test_opt34 keeps its tolerances; fresh sensors read the day they are on ... The silent and fresh nights diverged only because the test's fresh sensors kept reading the evening's 0.4 kWh 'left today' after midnight, while the kept figure is the 4th's 6.0 kWh (solarfc.Hold.stand_in, as_today): two different shortfalls (16.5 and 12.7 kWh) that A's ceiling hid until B was counted. Fresh sensors now read 6.0 after midnight, so fresh and kept are the same figure; the 0.3 tolerance is back, the other exact values are recomputed. test_ux54 literals are recomputed too. Co-Authored-By: Claude <noreply@anthropic.com>	2026-11-02 05:34:32 +01:00
glenn schrooyenandClaude	6a527de851	OPT-36: test_opt34 and test_ux54 scenarios keep a shortfall B does not cover ... With Cheap hours B counted, A buys only what B cannot reach. The OPT-34 night scenarios use a 1.6 x larger house profile, and the ux54 tab scenarios a 4.8 kW evening (ux54_scenarios.make(evening=)), so A still charges; the hard-coded levels become relations. Co-Authored-By: Claude <noreply@anthropic.com>	2026-11-02 03:30:39 +01:00
glenn schrooyenandClaude	60674e45ba	OPT-36: test_opt36 reads possibly-missing values through nth() ... Co-Authored-By: Claude <noreply@anthropic.com>	2026-11-02 02:50:33 +01:00
glenn schrooyenandClaude	490f67924b	OPT-36: test a give block before tonight's charge, Solar first refusing and in maintenance ... Co-Authored-By: Claude <noreply@anthropic.com>	2026-11-02 02:43:02 +01:00
glenn schrooyenandClaude	05746c0564	OPT-36: Leftover solar counts what Cheap hours and Solar first batteries will give before buying ... Live 0.20.0: A (Leftover solar, 60 %) charged to 95 % while B (Cheap hours, 94 %) already covered the expensive hours. dayplan.plan() now takes off the shortfall what Cheap hours batteries will hold when the hours start (the ceiling or what their cheap run reaches under the peak aim) and what Solar first batteries will still hold after the night's use. Home reads a give block after the planned charge, plan_cover() is the plan's own figure, and the Why line says other batteries cover. Co-Authored-By: Claude <noreply@anthropic.com>	2026-11-02 02:03:04 +01:00