Mirrors/EOS
1
0
Fork 0
mirror of https://github.com/Akkudoktor-EOS/EOS.git synced 2025-08-25 15:01:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Optimize states (#256)

Browse Source 
* optimization states for AC, DC and IDLE now similar probab. Also AC states taken from config. Maybe a single config option for AC and E-Auto States is sensefull.
 * Ruff
 * test_class_optimize: Update testdata
 * Write pdf and json to test/testdata/new.... so it can be analyzed
   manually or just copied as new expected result.
 * workflow: Upload pytest optimization result artifacts (pdf, json)

---------

Co-authored-by: Andreas <drbacke@gmx.de>
This commit is contained in:
Dominique Lasserre
2024-12-16 13:37:16 +01:00
committed by GitHub
parent da419dbf39
commit 3d8a97e128
8 changed files with 842 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

620
tests/testdata/optimize_result_2.json vendored
View File

@@ -2,50 +2,50 @@
"ac_charge": [
0.0,
0.0,
0.2,
0.4,
0.0,
0.4,
0.625,
0.0,
0.8,
1.0,
0.6,
0.0,
0.8,
1.0,
0.6,
1.0,
0.0,
0.4,
1.0,
0.8,
0.2,
0.0,
1.0,
0.8,
0.8,
0.4,
0.6,
0.2,
0.6,
0.2,
0.8,
0.2,
0.625,
0.0,
0.375,
0.0,
0.0,
0.75,
0.0,
0.75,
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.75,
0.0,
0.0,
1.0,
0.8,
0.4,
0.0,
1.0,
1.0,
0.2,
0.0,
1.0,
0.4,
0.6,
0.2,
1.0,
0.6,
0.0,
0.0
],
@@ -100,6 +100,42 @@
1.0
],
"discharge_allowed": [
0,
0,
1,
0,
0,
1,
1,
1,
0,
1,
0,
1,
1,
0,
0,
0,
0,
1,
0,
1,
1,
1,
1,
1,
0,
1,
1,
0,
0,
0,
1,
1,
1,
0,
0,
0,
0,
0,
0,
@@ -111,104 +147,68 @@
0,
0,
1,
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,
1,
1
0
],
"eautocharge_hours_float": [
0.0,
0.5,
0.0,
0.5,
0.375,
1.0,
0.875,
0.375,
0.5,
0.75,
1.0,
1.0,
0.875,
0.0,
1.0,
0.375,
0.875,
0.875,
0.75,
1.0,
1.0,
0.5,
0.625,
0.875,
0.75,
0.5,
0.0,
0.625,
0.5,
1.0,
1.0,
0.375,
0.375,
0.375,
0.75,
0.5,
1.0,
0.875,
0.875,
0.5,
0.75,
0.0,
0.875,
0.875,
0.5,
0.75,
0.75,
0.375,
0.75,
0.375,
1.0,
1.0,
0.625,
0.75,
0.5,
0.0,
1.0,
0.625,
0.875,
0.375,
1.0,
0.375,
0.625,
0.75,
0.75,
0.0,
0.5,
0.875,
0.875,
0.75,
0.875,
0.5,
0.875,
0.0,
0.0
0.375,
0.875,
1.0,
0.5
],
"result": {
"Last_Wh_pro_Stunde": [
11541.07,
8996.91,
14186.56,
17120.03,
14608.281570247937,
7731.82,
6460.22,
3041.7799999999997,
12105.07,
10240.91,
10497.56,
12748.03,
8907.67,
13981.82,
10393.22,
1730.78,
1129.12,
1178.71,
1050.98,
@@ -232,7 +232,7 @@
1232.67,
871.26,
860.88,
1158.03,
4027.009545454555,
1222.72,
1221.04,
949.99,
@@ -241,13 +241,13 @@
592.97
],
"EAuto_SoC_pro_Stunde": [
22.48,
29.035,
42.144999999999996,
59.62499999999999,
77.105,
88.03,
96.77,
20.294999999999998,
35.589999999999996,
50.885000000000005,
63.995000000000005,
72.735,
83.66,
98.955,
100.0,
100.0,
100.0,
@@ -289,7 +289,6 @@
0.0,
0.0,
0.0,
0.0569765,
0.0,
0.0,
0.0,
@@ -305,14 +304,15 @@
0.0,
0.0,
0.0,
0.009006199999999989,
0.03141599999999999,
0.0931259,
0.012268899999999998,
0.31400739999999994,
0.257789,
0.1516669,
0.09915009999999999,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0348376,
0.0,
0.0,
@@ -320,17 +320,17 @@
0.0,
0.0
],
"Gesamt_Verluste": 5357.560661157026,
"Gesamtbilanz_Euro": 13.87138792561157,
"Gesamteinnahmen_Euro": 1.0602444999999998,
"Gesamtkosten_Euro": 14.93163242561157,
"Gesamt_Verluste": 8823.859090909093,
"Gesamtbilanz_Euro": 12.348447740818184,
"Gesamteinnahmen_Euro": 0.0348376,
"Gesamtkosten_Euro": 12.383285340818183,
"Home_appliance_wh_per_hour": [
0.0,
0.0,
0.0,
2500.0,
2500.0,
0.0,
2500.0,
2500.0,
0.0,
0.0,
0.0,
@@ -365,29 +365,29 @@
0.0
],
"Kosten_Euro_pro_Stunde": [
1.2792601199999998,
1.759349592,
2.737606326,
2.9985720859999994,
1.5787430366115707,
0.44343509999999997,
0.547376732,
0.005407139999999934,
2.54785212,
0.928522392,
0.9189986259999999,
2.1770732859999997,
0.53097063,
1.6959351,
1.4118501319999999,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.05480703000000003,
0.225316611,
0.291163892,
0.26650619799999997,
0.19588158,
0.174739608,
0.28801899,
0.22802125600000003,
0.0,
0.0,
0.199865757,
0.182970359,
0.162995926,
0.16677339,
0.26411047,
0.24530383800000005,
0.0,
0.0,
0.0,
0.08545095,
0.0,
0.0,
@@ -396,38 +396,38 @@
0.0,
0.0,
0.0,
0.0,
0.651258356818184,
0.0,
0.08231598,
0.174597189,
0.293043269,
0.0,
0.0
0.16484566
],
"Netzbezug_Wh_pro_Stunde": [
5610.789999999999,
7953.66,
13079.82,
15958.339999999998,
8589.461570247937,
2212.75,
2490.34,
23.81999999999971,
11174.789999999999,
4197.66,
4390.82,
11586.34,
2888.8500000000004,
8462.75,
6423.339999999999,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
171.54000000000008,
731.31,
980.68,
912.38,
704.61,
516.37,
868.05,
694.34,
0.0,
0.0,
608.79,
556.31,
488.89,
506.91,
799.85,
806.3900000000001,
0.0,
0.0,
0.0,
351.65,
0.0,
0.0,
@@ -436,13 +436,13 @@
0.0,
0.0,
0.0,
0.0,
2868.979545454555,
0.0,
257.64,
566.69,
987.01,
0.0,
0.0
592.97
],
"Netzeinspeisung_Wh_pro_Stunde": [
0.0,
@@ -453,7 +453,6 @@
0.0,
0.0,
0.0,
813.95,
0.0,
0.0,
0.0,
@@ -469,14 +468,15 @@
0.0,
0.0,
0.0,
128.65999999999985,
448.79999999999995,
1330.3700000000001,
175.26999999999998,
4485.82,
3682.7,
2166.67,
1416.43,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
497.68000000000006,
0.0,
0.0,
@@ -485,84 +485,84 @@
0.0
],
"Verluste_Pro_Stunde": [
1233.818181818182,
687.0,
1014.0,
912.0,
606.7933884297523,
345.0,
708.0,
1164.818181818182,
1164.818181818182,
864.0,
276.0,
102.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,
795.0,
483.0,
187.4616000000001,
97.67399999999998,
23.391818181818195,
99.72409090909093,
133.72909090909081,
124.41545454545451,
96.08318181818186,
0.0,
118.37045454545455,
94.68272727272722,
0.0,
0.0,
0.0,
69.12409090909085,
109.0704545454546,
109.96227272727276,
0.0,
15.439199999999985,
53.855999999999995,
159.6443999999999,
21.032399999999996,
538.2984000000001,
441.924,
260.0003999999999,
514.2491454545468,
0.0,
0.0,
0.0,
0.0,
100.08954545454549,
80.85954545454547
0.0
],
"akku_soc_pro_stunde": [
58.47796143250689,
71.81129476584022,
88.47796143250687,
98.47796143250687,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
86.25,
64.72796143250687,
43.20592286501377,
55.70592286501377,
55.70592286501377,
68.20592286501376,
68.20592286501376,
72.49652286501377,
75.20968953168044,
74.47131143250688,
71.32345502754819,
67.10220847107436,
63.17495296143248,
60.14202424242422,
60.14202424242422,
56.40558312672175,
53.41686067493111,
53.41686067493111,
53.41686067493111,
53.41686067493111,
51.23491336088152,
47.792032851239654,
44.3210015151515,
44.3210015151515,
44.749868181818165,
46.24586818181816,
50.68043484848482,
51.264668181818166,
66.21740151515148,
78.49306818181815,
85.71530151515148,
100.0,
100.0,
100.0,
100.0,
100.0,
96.84060778236915,
94.28822314049587
96.84060778236915
]
},
"eauto_obj": {
@@ -676,102 +676,102 @@
},
"start_solution": [
0.0,
4.0,
13.0,
17.0,
14.0,
12.0,
9.0,
9.0,
17.0,
13.0,
15.0,
12.0,
9.0,
18.0,
14.0,
18.0,
14.0,
9.0,
2.0,
8.0,
10.0,
12.0,
10.0,
10.0,
14.0,
8.0,
7.0,
2.0,
6.0,
4.0,
7.0,
10.0,
8.0,
2.0,
5.0,
0.0,
2.0,
3.0,
4.0,
5.0,
14.0,
10.0,
18.0,
11.0,
1.0,
3.0,
0.0,
5.0,
13.0,
1.0,
5.0,
6.0,
4.0,
0.0,
2.0,
0.0,
2.0,
1.0,
5.0,
6.0,
4.0,
6.0,
0.0,
3.0,
6.0,
5.0,
1.0,
2.0,
0.0,
6.0,
5.0,
5.0,
3.0,
5.0,
4.0,
2.0,
3.0,
5.0,
4.0,
2.0,
5.0,
2.0,
0.0,
6.0,
5.0,
3.0,
0.0,
6.0,
6.0,
2.0,
0.0,
6.0,
3.0,
4.0,
2.0,
6.0,
4.0,
1.0,
1.0,
0.0,
1.0,
5.0,
1.0,
2.0,
4.0,
6.0,
6.0,
5.0,
0.0,
6.0,
1.0,
4.0,
6.0,
6.0,
3.0,
2.0,
6.0,
6.0,
1.0,
1.0,
1.0,
4.0,
2.0,
6.0,
5.0,
5.0,
2.0,
4.0,
0.0,
5.0,
5.0,
2.0,
4.0,
4.0,
1.0,
4.0,
1.0,
6.0,
6.0,
1.0,
3.0,
4.0,
4.0,
0.0,
2.0,
5.0,
5.0,
4.0,
5.0,
2.0,
5.0,
0.0,
1.0,
3.0,
0.0,
0.0,
0.0,
13.0
5.0,
6.0,
2.0,
14.0
],
"washingstart": 13
"washingstart": 14
}