Mirrors/EOS
1
0
Fork 0
mirror of https://github.com/Akkudoktor-EOS/EOS.git synced 2026-08-31 12:46:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

feat(optimization): schedule any number of flexible consumers

Browse Source 
Replace the single hourly "dishwasher" home appliance with a list of
flexible consumers (home_appliances). Each consumer defines its load
either as an explicit power profile (energy-preservingly resampled onto
the optimization slot grid, incl. 15-min and non-integer interval ratios)
or the flat consumption_wh/duration_h fallback, and runs ONCE or DAILY
within its time windows and the optimization horizon.

- ConsumerScheduleMode + shared load-definition validation (XOR of
  profile/fallback, reject negative/NaN/inf, unique device_id)
- ApplianceGeneLayout: variable appliance gene block (index into
  allowed_start_slots), ONCE/DAILY calendar-day based, no snapping
- per-device output: result.home_appliance_energy_wh, appliance_starts
  (absolute local times), per-device solution columns and DDBC RUN/OFF
  instructions on state transitions only
- deprecate dishwasher/washingstart/Home_appliance_wh_per_hour with
  backward-compatible mapping and explicit conflict rejection
- max_home_appliances is now an upper bound only; no demo appliance and
  no on/off behaviour
- docs, openapi.json, CHANGELOG and optimize_result_2* fixtures updated;
  new tests/test_homeappliance.py covers the mandatory test matrix

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Andreas
2026-07-15 14:19:46 +02:00
co-authored by Claude Opus 4.8
parent c59bf1b486
commit 67cf6f7d8a
21 changed files with 2505 additions and 1094 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/testdata/optimize_result_2.json
Vendored
+338 -291
View File
@@ -10,12 +10,24 @@
0.0,
0.0,
0.0,
1.0,
0.0,
0.0,
1.0,
1.0,
1.0,
1.0,
1.0,
1.0,
1.0,
1.0,
0.0,
1.0,
0.0,
0.0,
0.0,
0.0,
0.0,
1.0,
1.0,
0.0,
@@ -25,7 +37,6 @@
0.0,
1.0,
1.0,
1.0,
0.0,
0.0,
0.0,
@@ -36,17 +47,6 @@
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
1.0,
0.0,
1.0,
0.0,
0.0
],
"dc_charge": [
@@ -110,7 +110,11 @@
0,
0,
0,
0,
1,
1,
0,
0,
0,
0,
0,
@@ -121,19 +125,18 @@
0,
0,
1,
1,
0,
0,
0,
0,
1,
0,
0,
0,
1,
1,
1,
1,
0,
1,
1,
1,
0,
0,
0,
1,
@@ -142,9 +145,6 @@
1,
1,
1,
1,
0,
0,
0,
1,
1
@@ -161,15 +161,15 @@
0.0,
0.0,
0.0,
0.875,
0.75,
0.0,
0.875,
0.75,
1.0,
0.625,
0.375,
1.0,
0.75,
0.875,
0.1,
0.75,
0.0,
0.0,
0.0,
0.0,
@@ -202,28 +202,28 @@
],
"result": {
"Last_Wh_pro_Stunde": [
1053.07,
10240.91,
14186.477801352086,
11620.03,
10686.11504084929,
7609.82,
9082.22,
10280.78,
2177.92,
15230.07,
8929.91,
1320.56,
10061.61912107894,
13077.21553917656,
9042.82,
10393.22,
8969.78,
1129.12,
1178.71,
1050.98,
1488.5587949275546,
988.56,
912.38,
2204.61,
704.61,
516.37,
868.05,
694.34,
608.79,
556.31,
2056.31,
488.89,
506.91,
804.89,
1304.8889978824886,
1141.98,
1056.97,
992.46,
@@ -235,51 +235,51 @@
860.88,
1158.03,
1222.72,
1221.04,
949.99,
3721.04,
3449.99,
987.01,
733.99,
592.97
],
"EAuto_SoC_pro_Stunde": [
5.0,
5.0,
20.294999999999998,
33.405,
50.885000000000005,
61.809999999999995,
68.365,
81.475,
96.77,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518,
98.518
33.405,
39.96,
57.440000000000005,
70.55,
85.845,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955,
98.955
],
"Einnahmen_Euro_pro_Stunde": [
0.0,
@@ -288,10 +288,12 @@
0.0,
0.0,
0.0,
0.005594705401588846,
0.0016437871377312284,
0.028240415856282213,
9.722458428505041e-05,
0.0023429436853348124,
0.0692592282596561,
0.023370695807696434,
0.0019327051509204403,
8.435507117427132e-07,
0.0,
0.0,
0.0,
@@ -305,27 +307,54 @@
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.09023487592359272,
0.03692581803776506,
0.09634325718089931,
0.038455087951794004,
0.31400739999999994,
0.2577866264025879,
0.15146384621553569,
0.09798107754792196,
0.029150936607659956,
0.020928608511559126,
0.003524558735906156,
0.0,
0.0,
0.0,
0.0,
0.0
],
"Gesamt_Verluste": 6008.882879266785,
"Gesamtbilanz_Euro": 13.081213953988335,
"Gesamteinnahmen_Euro": 0.7099201341480623,
"Gesamtkosten_Euro": 13.791134088136397,
"Gesamt_Verluste": 6850.393259430652,
"Gesamtbilanz_Euro": 13.198417631718888,
"Gesamteinnahmen_Euro": 1.1191176909827683,
"Gesamtkosten_Euro": 14.317535322701657,
"Home_appliance_wh_per_hour": [
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
@@ -334,113 +363,126 @@
2500.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0
],
"home_appliance_energy_wh": {
"dishwasher1": [
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
2500.0,
2500.0,
0.0,
0.0,
0.0
]
},
"Kosten_Euro_pro_Stunde": [
3.26035212,
0.7712613792641736,
0.0,
2.034522392,
2.737606326,
1.9651220859999998,
0.9176848434271027,
0.5064650351737862,
1.1459236583154115,
1.6539907068609285,
0.1912938683161112,
1.672937586,
1.342948866431813,
0.770122611209644,
1.4257539978642364,
1.3586609716653002,
0.05258762370598476,
0.1614775630079859,
0.0,
0.4396171120740812,
0.0,
0.61288158,
0.174739608,
0.28801899,
0.2338232746714084,
0.29116746986009023,
0.26650619799999997,
0.19588158,
0.0,
0.0,
0.22802125600000003,
0.199865757,
0.676320359,
0.162995926,
0.0,
0.42921344809282075,
0.25364873699864443,
0.1306329312971816,
0.0,
0.16677339,
0.0,
0.0,
0.0,
0.07362195915902499,
0.060401289430882174,
0.009619897970888898,
0.07029121023060134,
4.179128154646605e-17,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.17784012884918773,
0.19011028252189552,
0.293043269,
0.0,
0.0
],
"Netzbezug_Wh_pro_Stunde": [
14299.789999999999,
3486.7150961309835,
0.0,
9197.66,
13079.82,
10458.34,
4992.84463235638,
2527.2706345997312,
5213.483431826258,
7286.3026733961615,
638.2845122326032,
8903.34,
7306.577075254695,
3842.9272016449304,
6486.596896561585,
5985.290624076212,
175.4675465665157,
505.40708296709204,
0.0,
1480.6908456520082,
0.0,
2204.61,
516.37,
868.05,
758.9200735845777,
980.6920507244535,
912.38,
704.61,
0.0,
0.0,
694.34,
608.79,
2056.31,
488.89,
0.0,
1299.8590190576037,
833.8222781020527,
537.58407941227,
0.0,
506.91,
0.0,
0.0,
0.0,
322.9033296448464,
273.0618871197205,
45.96224544141853,
374.088399311343,
2.2737367544323206e-13,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
556.6201215937018,
617.0408390843736,
987.01,
0.0,
0.0
@@ -452,10 +494,12 @@
0.0,
0.0,
0.0,
79.92436287984066,
23.482673396160408,
403.4345122326031,
1.3889226326435775,
33.47062407621161,
989.4175465665157,
333.86708296709196,
27.61007358457772,
0.012050724453467332,
0.0,
0.0,
0.0,
@@ -469,92 +513,68 @@
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
1289.0696560513247,
527.5116862537866,
1376.3322454414188,
549.358399311343,
4485.82,
3682.6660914655417,
2163.76923165051,
1399.729679256028,
416.4419515379994,
298.9801215937018,
50.35083908437366,
0.0,
0.0,
0.0,
0.0,
0.0
],
"Verluste_Pro_Stunde": [
97.85621559422765,
483.0,
1014.0000000000001,
552.0,
440.15935588276557,
259.38247615196775,
416.54628827357027,
483.0,
55.200000000000045,
1083.0,
1014.0066115357181,
114.42806532440363,
806.9999999999999,
752.8472490305633,
452.3012641973916,
490.424156871473,
414.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
70.41409090909087,
118.37045454545455,
0.0,
0.0,
106.80230977350088,
60.001301478240954,
124.41545454545451,
180.0,
0.0,
69.12409090909085,
60.00108228691243,
3.2918733722463145,
22.312089529472388,
98.21987178167876,
23.32202410391207,
0.0,
0.0,
94.68272727272722,
83.01681818181817,
75.86045454545456,
66.66681818181814,
0.0,
109.07302361034766,
116.99491129525349,
95.61900944932736,
54.18759955738153,
86.6234264543665,
171.42744837680007,
116.9350623689079,
383.6100412738411,
0.03390853445803674,
2.900768349489402,
16.700320743972142,
81.2380484620021,
0.0,
0.0,
377.3215838283509,
418.18661420587983,
0.0,
100.08954545454549,
80.85954545454547
],
"akku_soc_pro_stunde": [
80.0,
79.16421888032488,
79.16421888032488,
95.83088554699157,
95.83088554699157,
98.47420098817949,
99.9292697701786,
100.0,
100.0,
100.0,
100.0,
96.82533215994886,
98.49203497878888,
94.56477946914701,
99.564779469147,
99.564779469147,
99.564779469147,
96.57605701735636,
93.95557664545554,
91.56099159035911,
89.45660970330677,
89.45660970330677,
86.01371946235848,
82.51604934381585,
80.82184855044719,
82.32705964926333,
84.7332659396624,
89.12319984732603,
89.34416552017109,
96.66666666666667,
77.72745638104269,
76.48409249723811,
93.15075916390477,
98.72984941475377,
99.79377342023686,
100.0,
100.0,
100.0,
@@ -563,7 +583,29 @@
100.0,
100.0,
100.0,
96.84060778236915
97.77733298898072,
94.04089187327823,
94.04089187327823,
94.04089187327823,
99.04089187327823,
99.04089187327823,
96.85894455922863,
98.52564128942065,
98.6170822164275,
99.23686248113506,
99.35216599711354,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
88.1251455158017,
74.92485531047642,
74.92485531047642,
71.76546309284556
],
"Electricity_price": [
0.000228,
@@ -660,15 +702,15 @@
0.0,
0.0,
0.0,
0.875,
0.75,
0.0,
0.875,
0.75,
1.0,
0.625,
0.375,
1.0,
0.75,
0.875,
0.1,
0.75,
0.0,
0.0,
0.0,
0.0,
@@ -753,44 +795,47 @@
"capacity_wh": 60000,
"charging_efficiency": 0.95,
"max_charge_power_w": 11040,
"soc_wh": 59110.8,
"soc_wh": 59373.0,
"initial_soc_percentage": 5
},
"start_solution": [
2.0,
1.0,
1.0,
0.0,
1.0,
1.0,
0.0,
2.0,
2.0,
1.0,
2.0,
1.0,
1.0,
2.0,
2.0,
2.0,
2.0,
2.0,
2.0,
2.0,
2.0,
0.0,
2.0,
0.0,
1.0,
1.0,
0.0,
2.0,
1.0,
1.0,
1.0,
0.0,
2.0,
0.0,
2.0,
0.0,
2.0,
1.0,
2.0,
0.0,
2.0,
1.0,
2.0,
1.0,
2.0,
2.0,
2.0,
1.0,
1.0,
1.0,
1.0,
0.0,
1.0,
1.0,
1.0,
0.0,
0.0,
1.0,
@@ -799,61 +844,63 @@
1.0,
1.0,
1.0,
1.0,
2.0,
0.0,
2.0,
1.0,
1.0,
6.0,
2.0,
1.0,
1.0,
6.0,
4.0,
6.0,
4.0,
2.0,
5.0,
0.0,
5.0,
4.0,
6.0,
3.0,
1.0,
4.0,
5.0,
3.0,
6.0,
5.0,
3.0,
0.0,
5.0,
4.0,
0.0,
1.0,
6.0,
4.0,
5.0,
4.0,
1.0,
3.0,
3.0,
2.0,
3.0,
0.0,
1.0,
3.0,
4.0,
5.0,
1.0,
3.0,
0.0,
2.0,
2.0,
5.0,
5.0,
5.0,
6.0,
1.0,
5.0,
5.0,
0.0,
0.0,
0.0,
5.0,
3.0,
5.0,
2.0,
0.0,
0.0,
4.0,
5.0,
0.0,
0.0,
6.0,
1.0,
1.0,
6.0,
0.0,
5.0,
2.0,
6.0,
3.0,
4.0,
5.0,
6.0,
2.0,
2.0,
14.0
33.0
],
"washingstart": 14
"washingstart": 43,
"appliance_starts": {
"dishwasher1": [
"2026-07-16 19:00:00+02:00"
]
}
}