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

448
tests/testdata/optimize_result_2_full.json vendored
View File

@@ -1,30 +1,34 @@
{
"ac_charge": [
0.2,
0.6,
0.0,
0.0,
0.875,
0.0,
1.0,
0.8,
0.6,
0.0,
0.6,
0.0,
0.6,
0.0,
0.0,
0.0,
0.2,
1.0,
0.4,
0.4,
0.4,
0.8,
1.0,
0.6,
0.8,
0.8,
0.6,
0.4,
0.0,
0.875,
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,
@@ -38,11 +42,7 @@
0.0,
0.0,
0.0,
0.6,
0.0,
1.0,
0.2,
0.4,
0.0,
0.0,
0.0,
@@ -100,6 +100,7 @@
1.0
],
"discharge_allowed": [
1,
0,
0,
1,
@@ -107,7 +108,6 @@
0,
0,
1,
0,
1,
0,
1,
@@ -115,16 +115,12 @@
0,
0,
0,
1,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
1,
1,
1,
1,
1,
1,
1,
@@ -141,39 +137,43 @@
0,
1,
0,
1,
1,
0,
1,
0,
1,
1,
1,
1,
1,
1
],
"eautocharge_hours_float": [
0.625,
0.875,
1.0,
0.0,
0.875,
0.375,
0.875,
1.0,
0.375,
1.0,
0.0,
0.0,
1.0,
1.0,
1.0,
1.0,
0.75,
0.75,
0.5,
0.0,
1.0,
0.625,
0.0,
0.875,
0.75,
1.0,
0.0,
0.75,
1.0,
1.0,
1.0,
0.375,
0.75,
0.5,
0.5,
1.0,
0.625,
0.875,
0.625,
1.0,
0.875,
0.375,
0.625,
0.375,
0.375,
0.0,
0.0,
0.0,
@@ -202,13 +202,13 @@
"result": {
"Last_Wh_pro_Stunde": [
1053.07,
1063.91,
8929.91,
11808.56,
15120.029999999999,
19151.67,
11823.38146694215,
11620.03,
14151.67,
7609.82,
9082.22,
7658.78,
6347.78,
1756.12,
1178.71,
1050.98,
@@ -229,7 +229,7 @@
1155.99,
827.01,
1257.98,
1999.9845041322394,
1232.67,
871.26,
860.88,
1158.03,
@@ -242,12 +242,12 @@
],
"EAuto_SoC_pro_Stunde": [
5.0,
5.0,
22.48,
39.96,
57.440000000000005,
74.92,
88.03,
18.11,
35.589999999999996,
53.06999999999999,
70.55,
77.105,
90.215,
98.955,
100.0,
100.0,
@@ -289,7 +289,6 @@
0.0,
0.0,
0.0,
0.013086500000000003,
0.0,
0.0,
0.0,
@@ -310,27 +309,28 @@
0.0,
0.0,
0.0,
0.257789,
0.1516669,
0.09915009999999999,
0.0348376,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0
],
"Gesamt_Verluste": 5838.775971074382,
"Gesamtbilanz_Euro": 11.51451054883471,
"Gesamteinnahmen_Euro": 0.5565300999999999,
"Gesamtkosten_Euro": 12.07104064883471,
"Gesamt_Verluste": 7248.648818181819,
"Gesamtbilanz_Euro": 8.568052366,
"Gesamteinnahmen_Euro": 0.0,
"Gesamtkosten_Euro": 8.568052366,
"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,
@@ -366,20 +366,12 @@
],
"Kosten_Euro_pro_Stunde": [
0.0,
0.004569992000000018,
1.7445291920000001,
2.2398909259999997,
2.6227720859999994,
2.41381783,
1.263384017975207,
1.9651220859999998,
1.4948178300000001,
0.0,
1.1236923319999998,
1.0534661399999998,
0.0,
0.05480703000000003,
0.225316611,
0.291163892,
0.26650619799999997,
0.19588158,
0.174739608,
0.0,
0.0,
0.0,
@@ -393,7 +385,15 @@
0.0,
0.0,
0.0,
0.14103240585950558,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
@@ -406,20 +406,12 @@
],
"Netzbezug_Wh_pro_Stunde": [
0.0,
20.660000000000082,
7886.66,
10701.82,
13958.339999999998,
13132.85,
6304.31146694215,
10458.34,
8132.85,
0.0,
5112.339999999999,
4640.82,
0.0,
171.54000000000008,
731.31,
980.68,
912.38,
704.61,
516.37,
0.0,
0.0,
0.0,
@@ -433,7 +425,15 @@
0.0,
0.0,
0.0,
767.3145041322393,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
@@ -453,7 +453,6 @@
0.0,
0.0,
0.0,
186.95000000000005,
0.0,
0.0,
0.0,
@@ -474,10 +473,11 @@
0.0,
0.0,
0.0,
3682.7,
2166.67,
1416.43,
497.68000000000006,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
@@ -486,20 +486,20 @@
],
"Verluste_Pro_Stunde": [
16.744090909090914,
0.0,
552.0,
672.0,
1152.0,
571.027376033058,
414.0,
345.0,
33.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
552.0,
552.0,
552.0,
492.1022727272725,
414.0,
730.0663636363638,
55.434,
23.391818181818195,
99.72409090909093,
133.72909090909081,
124.41545454545451,
96.08318181818186,
70.41409090909087,
118.37045454545455,
94.68272727272722,
83.01681818181817,
@@ -513,11 +513,11 @@
53.855999999999995,
159.6443999999999,
21.032399999999996,
630.3761404958689,
0.0,
0.0,
0.0,
0.0,
538.2984000000001,
441.924,
260.0003999999999,
169.97160000000008,
59.721600000000024,
35.132727272727266,
77.27590909090907,
134.59227272727276,
@@ -528,41 +528,41 @@
79.4714617768595,
79.4714617768595,
79.4714617768595,
82.80479511019283,
99.4714617768595,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
100.0,
96.26355888429752,
93.27483643250687,
90.65435606060605,
88.25977100550962,
86.15538911845726,
83.97344180440768,
80.5305612947658,
77.05952995867766,
75.54588498622586,
75.97475165289252,
77.47075165289253,
81.9053183195592,
82.48955165289253,
100.0,
100.0,
100.0,
100.0,
100.0,
98.89101239669421,
96.45174758953168,
92.20325413223141,
89.04386191460057,
86.4914772727273
79.4714617768595,
79.4714617768595,
70.47202134986226,
70.47202134986226,
56.13911845730028,
56.76228512396694,
56.02390702479339,
52.876050619834714,
48.654804063360885,
44.72754855371902,
41.69461983471075,
39.47195282369147,
35.73551170798899,
32.746789256198355,
30.126308884297526,
27.731723829201112,
25.627341942148767,
23.445394628099184,
20.002514118457306,
16.531482782369153,
15.017837809917364,
15.446704476584031,
16.94270447658403,
21.377271143250695,
21.961504476584032,
36.91423780991737,
49.189904476584026,
56.41213780991736,
61.133571143250684,
62.79250447658402,
61.68351687327823,
59.2442520661157,
54.99575860881543,
51.836366391184576,
49.28398174931129
]
},
"eauto_obj": {
@@ -675,78 +675,78 @@
"start_soc_prozent": 5
},
"start_solution": [
2.0,
12.0,
4.0,
1.0,
19.0,
9.0,
20.0,
14.0,
6.0,
9.0,
8.0,
19.0,
7.0,
2.0,
2.0,
1.0,
3.0,
8.0,
14.0,
11.0,
10.0,
9.0,
10.0,
12.0,
11.0,
13.0,
11.0,
8.0,
10.0,
10.0,
9.0,
11.0,
13.0,
7.0,
8.0,
7.0,
1.0,
7.0,
2.0,
11.0,
11.0,
14.0,
11.0,
5.0,
10.0,
9.0,
13.0,
10.0,
9.0,
8.0,
4.0,
4.0,
2.0,
0.0,
6.0,
3.0,
0.0,
5.0,
4.0,
6.0,
0.0,
4.0,
6.0,
6.0,
6.0,
1.0,
4.0,
1.0,
4.0,
1.0,
0.0,
0.0,
2.0,
2.0,
6.0,
3.0,
3.0,
3.0,
5.0,
6.0,
4.0,
5.0,
5.0,
4.0,
3.0,
1.0,
1.0,
1.0,
1.0,
1.0,
1.0,
1.0,
1.0,
1.0,
1.0,
1.0,
1.0,
1.0,
4.0,
1.0,
6.0,
2.0,
3.0,
1.0,
1.0,
1.0,
1.0,
1.0,
3.0,
5.0,
6.0,
0.0,
5.0,
1.0,
5.0,
6.0,
1.0,
6.0,
0.0,
0.0,
6.0,
6.0,
6.0,
6.0,
4.0,
3.0,
6.0,
5.0,
1.0,
3.0,
1.0,
1.0,
0.0,
0.0,
0.0,
@@ -771,7 +771,7 @@
0.0,
0.0,
0.0,
13.0
14.0
],
"washingstart": 13
"washingstart": 14
}