Mirrors/EOS
1
0
Fork 0
mirror of https://github.com/Akkudoktor-EOS/EOS.git synced 2025-09-13 07:21:16 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Soc 1 hour shift fixed + some german -> english translations in ems

Browse Source
This commit is contained in:
Andreas
2024-12-22 12:03:48 +01:00
committed by Dominique Lasserre
parent 053e60aca4
commit 54eae5a871
14 changed files with 703 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

218
tests/testdata/optimize_input_2.json vendored
View File

@@ -1,34 +1,162 @@
{
"ems": {
"preis_euro_pro_wh_akku": 0.0001,
"preis_euro_pro_wh_akku": 0.0,
"einspeiseverguetung_euro_pro_wh": 0.00007,
"gesamtlast": [
676.71, 876.19, 527.13, 468.88, 531.38, 517.95, 483.15, 472.28, 1011.68, 995.00,
1053.07, 1063.91, 1320.56, 1132.03, 1163.67, 1176.82, 1216.22, 1103.78, 1129.12,
1178.71, 1050.98, 988.56, 912.38, 704.61, 516.37, 868.05, 694.34, 608.79, 556.31,
488.89, 506.91, 804.89, 1141.98, 1056.97, 992.46, 1155.99, 827.01, 1257.98, 1232.67,
871.26, 860.88, 1158.03, 1222.72, 1221.04, 949.99, 987.01, 733.99, 592.97
676.71,
876.19,
527.13,
468.88,
531.38,
517.95,
483.15,
472.28,
1011.68,
995.0,
1053.07,
1063.91,
1320.56,
1132.03,
1163.67,
1176.82,
1216.22,
1103.78,
1129.12,
1178.71,
1050.98,
988.56,
912.38,
704.61,
516.37,
868.05,
694.34,
608.79,
556.31,
488.89,
506.91,
804.89,
1141.98,
1056.97,
992.46,
1155.99,
827.01,
1257.98,
1232.67,
871.26,
860.88,
1158.03,
1222.72,
1221.04,
949.99,
987.01,
733.99,
592.97
],
"pv_prognose_wh": [
0, 0, 0, 0, 0, 0, 0, 8.05, 352.91, 728.51, 930.28, 1043.25, 1106.74, 1161.69,
6018.82, 5519.07, 3969.88, 3017.96, 1943.07, 1007.17, 319.67, 7.88, 0, 0, 0, 0,
0, 0, 0, 0, 0, 5.04, 335.59, 705.32, 1121.12, 1604.79, 2157.38, 1433.25, 5718.49,
4553.96, 3027.55, 2574.46, 1720.4, 963.4, 383.3, 0, 0, 0
0,
0,
0,
0,
0,
0,
0,
8.05,
352.91,
728.51,
930.28,
1043.25,
1106.74,
1161.69,
6018.82,
5519.07,
3969.88,
3017.96,
1943.07,
1007.17,
319.67,
7.88,
0,
0,
0,
0,
0,
0,
0,
0,
0,
5.04,
335.59,
705.32,
1121.12,
1604.79,
2157.38,
1433.25,
5718.49,
4553.96,
3027.55,
2574.46,
1720.4,
963.4,
383.3,
0,
0,
0
],
"strompreis_euro_pro_wh": [
0.0003384, 0.0003318, 0.0003284, 0.0003283, 0.0003289, 0.0003334, 0.0003290,
0.0003302, 0.0003042, 0.0002430, 0.0002280, 0.0002212, 0.0002093, 0.0001879,
0.0001838, 0.0002004, 0.0002198, 0.0002270, 0.0002997, 0.0003195, 0.0003081,
0.0002969, 0.0002921, 0.0002780, 0.0003384, 0.0003318, 0.0003284, 0.0003283,
0.0003289, 0.0003334, 0.0003290, 0.0003302, 0.0003042, 0.0002430, 0.0002280,
0.0002212, 0.0002093, 0.0001879, 0.0001838, 0.0002004, 0.0002198, 0.0002270,
0.0002997, 0.0003195, 0.0003081, 0.0002969, 0.0002921, 0.0002780
0.0003384,
0.0003318,
0.0003284,
0.0003283,
0.0003289,
0.0003334,
0.000329,
0.0003302,
0.0003042,
0.000243,
0.000228,
0.0002212,
0.0002093,
0.0001879,
0.0001838,
0.0002004,
0.0002198,
0.000227,
0.0002997,
0.0003195,
0.0003081,
0.0002969,
0.0002921,
0.000278,
0.0003384,
0.0003318,
0.0003284,
0.0003283,
0.0003289,
0.0003334,
0.000329,
0.0003302,
0.0003042,
0.000243,
0.000228,
0.0002212,
0.0002093,
0.0001879,
0.0001838,
0.0002004,
0.0002198,
0.000227,
0.0002997,
0.0003195,
0.0003081,
0.0002969,
0.0002921,
0.000278
]
},
"pv_akku": {
"capacity_wh": 26400,
"initial_soc_percentage": 80,
"min_soc_percentage": 15
"min_soc_percentage": 0
},
"eauto": {
"capacity_wh": 60000,
@@ -37,15 +165,59 @@
"initial_soc_percentage": 5,
"min_soc_percentage": 80
},
"dishwasher" :{
"dishwasher": {
"consumption_wh": 5000,
"duration_h": 2
},
"temperature_forecast": [
18.3, 17.8, 16.9, 16.2, 15.6, 15.1, 14.6, 14.2, 14.3, 14.8, 15.7, 16.7, 17.4,
18.0, 18.6, 19.2, 19.1, 18.7, 18.5, 17.7, 16.2, 14.6, 13.6, 13.0, 12.6, 12.2,
11.7, 11.6, 11.3, 11.0, 10.7, 10.2, 11.4, 14.4, 16.4, 18.3, 19.5, 20.7, 21.9,
22.7, 23.1, 23.1, 22.8, 21.8, 20.2, 19.1, 18.0, 17.4
18.3,
17.8,
16.9,
16.2,
15.6,
15.1,
14.6,
14.2,
14.3,
14.8,
15.7,
16.7,
17.4,
18.0,
18.6,
19.2,
19.1,
18.7,
18.5,
17.7,
16.2,
14.6,
13.6,
13.0,
12.6,
12.2,
11.7,
11.6,
11.3,
11.0,
10.7,
10.2,
11.4,
14.4,
16.4,
18.3,
19.5,
20.7,
21.9,
22.7,
23.1,
23.1,
22.8,
21.8,
20.2,
19.1,
18.0,
17.4
],
"start_solution": null
}

2
tests/testdata/optimize_result_1.json vendored
View File

@@ -476,6 +476,7 @@
0.0
],
"akku_soc_pro_stunde": [
80.0,
80.0,
79.91107093663912,
79.91107093663912,
@@ -512,7 +513,6 @@
100.0,
100.0,
100.0,
96.84060778236915,
96.84060778236915
],
"Electricity_price": [

124
tests/testdata/optimize_result_2.json vendored
View File

@@ -170,7 +170,7 @@
0.0,
0.5,
0.625,
0.0,
0.75,
0.0,
0.0,
0.0,
@@ -211,7 +211,7 @@
1103.78,
6373.12,
7733.71,
1050.98,
4299.98,
988.56,
912.38,
704.61,
@@ -241,6 +241,7 @@
592.97
],
"EAuto_SoC_pro_Stunde": [
5.0,
11.555,
11.555,
26.85,
@@ -251,34 +252,33 @@
74.92,
83.66,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585,
94.585
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
],
"Einnahmen_Euro_pro_Stunde": [
0.0,
@@ -320,7 +320,7 @@
0.0,
0.0
],
"Gesamt_Verluste": 9258.73062020124,
"Gesamt_Verluste": 9872.776074746695,
"Gesamtbilanz_Euro": 12.332782378812306,
"Gesamteinnahmen_Euro": 0.0,
"Gesamtkosten_Euro": 12.332782378812306,
@@ -495,7 +495,7 @@
230.91336797704525,
880.0977272727268,
1026.818181818182,
99.72409090909093,
713.7695454545456,
133.72909090909081,
124.41545454545451,
96.08318181818186,
@@ -525,6 +525,7 @@
0.0
],
"akku_soc_pro_stunde": [
80.0,
62.54222623966943,
62.54222623966943,
75.04222623966943,
@@ -535,34 +536,33 @@
83.83265434833275,
64.76391295714818,
43.24187438965506,
40.094017984696386,
35.87277142822256,
31.945515918580686,
28.912587199572425,
28.912587199572425,
25.176146083869945,
22.187423632079316,
22.187423632079316,
22.187423632079316,
22.187423632079316,
34.68742363207931,
34.68742363207931,
34.68742363207931,
34.68742363207931,
34.99947869620843,
36.0696843420455,
40.099841390631155,
40.249843096950585,
55.20257643028218,
67.47251658502745,
84.99550697329678,
88.77022785443704,
89.9213907145978,
89.9213907145978,
89.9213907145978,
89.9213907145978,
89.9213907145978,
89.9213907145978
26.108997323539356,
21.88775076706553,
17.96049525742366,
14.927566538415393,
14.927566538415393,
11.191125422712915,
8.20240297092228,
8.20240297092228,
8.20240297092228,
8.20240297092228,
20.70240297092228,
20.70240297092228,
20.70240297092228,
20.70240297092228,
21.014458035051405,
22.08466368088848,
26.114820729474133,
26.264822435793555,
41.217555769125156,
53.48749592387043,
71.01048631213975,
74.78520719328002,
75.93637005344077,
75.93637005344077,
75.93637005344077,
75.93637005344077,
75.93637005344077
],
"Electricity_price": [
0.000228,
@@ -711,7 +711,7 @@
"capacity_wh": 60000,
"charging_efficiency": 0.95,
"max_charge_power_w": 11040,
"soc_wh": 56751.0,
"soc_wh": 60000.0,
"initial_soc_percentage": 5
},
"start_solution": [
@@ -783,7 +783,7 @@
0.0,
2.0,
3.0,
0.0,
4.0,
0.0,
0.0,
0.0,

536
tests/testdata/optimize_result_2_full.json vendored
View File

@@ -3,15 +3,14 @@
0.0,
0.0,
0.0,
0.375,
0.0,
0.875,
0.0,
0.375,
0.0,
1.0,
1.0,
0.75,
0.0,
0.0,
0.0,
0.5,
0.0,
0.0,
0.0,
0.0,
@@ -19,6 +18,7 @@
0.0,
0.0,
0.0,
0.5,
0.0,
0.0,
0.0,
@@ -100,32 +100,25 @@
1.0
],
"discharge_allowed": [
1,
0,
1,
0,
1,
0,
1,
0,
0,
1,
0,
0,
0,
0,
1,
0,
0,
1,
1,
1,
0,
0,
0,
1,
1,
1,
1,
1,
1,
1,
1,
0,
1,
1,
0,
@@ -135,12 +128,19 @@
1,
1,
1,
0,
1,
1,
0,
1,
1,
0,
1,
1,
1,
1,
1,
1,
0,
0,
1,
1,
1,
@@ -150,66 +150,66 @@
1
],
"eautocharge_hours_float": [
0.5,
0.375,
0.625,
0.875,
0.875,
0.375,
0.0,
1.0,
0.75,
1.0,
0.0,
0.375,
0.625,
0.5,
0.5,
0.75,
0.375,
0.0,
0.5,
0.375,
0.0,
0.0,
0.5,
0.5,
0.625,
1.0,
0.5,
0.5,
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.375,
0.0,
0.0,
0.0,
0.375,
0.0,
0.0,
0.625,
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
],
"result": {
"Last_Wh_pro_Stunde": [
6297.07,
8929.91,
5253.5599999999995,
3632.0299999999997,
4986.07,
1063.91,
1320.56,
8876.029999999999,
8907.67,
7731.82,
11704.22,
7658.78,
1129.12,
6460.22,
6347.78,
3629.12,
1178.71,
1050.98,
988.56,
@@ -226,14 +226,14 @@
1141.98,
1056.97,
992.46,
1155.99,
5088.99,
827.01,
1257.98,
1232.67,
871.26,
4804.26,
860.88,
1158.03,
1222.72,
7777.72,
1221.04,
949.99,
987.01,
@@ -241,39 +241,39 @@
592.97
],
"EAuto_SoC_pro_Stunde": [
13.74,
26.85,
33.405,
33.405,
42.144999999999996,
53.06999999999999,
5.0,
11.555,
11.555,
11.555,
20.294999999999998,
29.035,
39.96,
48.699999999999996,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
57.440000000000005,
63.995000000000005,
63.995000000000005,
63.995000000000005,
63.995000000000005,
70.55,
70.55,
70.55,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
81.475,
@@ -320,10 +320,10 @@
0.0,
0.0
],
"Gesamt_Verluste": 6757.733989740087,
"Gesamtbilanz_Euro": 6.952642478544519,
"Gesamt_Verluste": 7755.845910804702,
"Gesamtbilanz_Euro": 4.690157296412734,
"Gesamteinnahmen_Euro": 0.0,
"Gesamtkosten_Euro": 6.952642478544519,
"Gesamtkosten_Euro": 4.690157296412734,
"Home_appliance_wh_per_hour": [
0.0,
0.0,
@@ -365,18 +365,18 @@
0.0
],
"Kosten_Euro_pro_Stunde": [
1.22362812,
1.7445291920000001,
0.0,
0.4641768859999999,
0.0,
0.0,
1.4495244859999996,
0.53097063,
0.0,
1.7000079319999999,
1.0534661399999998,
0.44343509999999997,
0.0,
0.0,
0.8107800974767518,
0.0,
0.0,
0.291163892,
0.0,
0.0,
0.0,
@@ -386,37 +386,37 @@
0.182970359,
0.0,
0.0,
0.26411047,
0.0,
0.0,
0.0326838476973626,
0.007989913613567745,
0.012219458233588555,
0.0,
0.002459704740224363,
0.0,
0.0,
0.05016012000000004,
0.0076430797975209205,
0.0,
0.31687880399999996,
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.16722497978466921,
0.16484566
],
"Netzbezug_Wh_pro_Stunde": [
5366.79,
7886.66,
0.0,
2470.3399999999997,
0.0,
0.0,
7714.339999999998,
2888.8500000000004,
0.0,
7734.339999999999,
4640.82,
2212.75,
0.0,
0.0,
2705.305630553059,
0.0,
0.0,
980.68,
0.0,
0.0,
0.0,
@@ -426,23 +426,23 @@
556.31,
0.0,
0.0,
799.85,
0.0,
0.0,
134.50143085334403,
35.04348076126204,
55.24167375040034,
0.0,
11.752053226107805,
0.0,
0.0,
250.30000000000018,
34.77288351920346,
0.0,
1057.3199999999997,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0
572.4922279516235,
592.97
],
"Netzeinspeisung_Wh_pro_Stunde": [
0.0,
@@ -485,18 +485,18 @@
0.0
],
"Verluste_Pro_Stunde": [
760.062272727273,
2.817272727272737,
29.157272727272726,
276.0,
414.0,
772.4754545454543,
0.0,
276.0,
646.7386363636365,
552.0,
345.0,
101.0335466817773,
615.5918181818183,
730.0663636363638,
373.0373243336329,
23.391818181818195,
99.72409090909093,
133.72909090909081,
0.0,
124.41545454545451,
96.08318181818186,
70.41409090909087,
@@ -506,63 +506,63 @@
0.0,
66.66681818181814,
69.12409090909085,
109.0704545454546,
0.0,
109.96227272727276,
29.61116851999853,
47.952272727272714,
11.233982308648535,
48.41330768174524,
161.62968357967037,
682.1181818181817,
160.0271308670193,
21.962728535423857,
538.2984000000038,
441.95211196761403,
260.56941082122324,
207.0,
255.8276539776955,
171.99990368477063,
62.214291413756285,
1026.818181818182,
35.132727272727266,
77.27590909090907,
134.59227272727276,
100.08954545454549,
80.85954545454547
22.022423461142267,
0.0
],
"akku_soc_pro_stunde": [
80.0,
80.0,
62.150396005509634,
62.150396005509634,
62.150396005509634,
52.62581783746556,
52.62581783746556,
52.62581783746556,
53.77091326251142,
53.03253516333787,
49.884678758379195,
45.663432201905366,
41.73617669226349,
38.70324797325523,
36.48058096223595,
32.74413984653347,
29.75541739474284,
27.134937022842013,
27.134937022842013,
25.030555135789673,
22.848607821740085,
19.405727312098207,
15.934695976010055,
15.0,
15.312055064129126,
16.07020564583707,
19.578139530578447,
19.728141236897873,
34.68087457022947,
46.94341995234899,
53.90006700591099,
57.67478788705125,
58.17025540478875,
57.06126780148296,
54.622002994320425,
50.373509537020155,
47.214117319389295,
44.661732677516014
62.54222623966943,
62.45329717630854,
61.532928719008275,
61.532928719008275,
61.532928719008275,
61.532928719008275,
50.81349001377411,
36.480587121212125,
46.842735019368604,
46.10435692019505,
42.95650051523637,
42.95650051523637,
39.029245005594504,
35.996316286586236,
33.77364927556696,
30.03720815986448,
27.048485708073848,
24.428005336173022,
24.428005336173022,
22.32362344912068,
20.141676135071094,
20.141676135071094,
16.670644798982938,
15.156999826531148,
15.469054890660274,
0.471637535288375,
4.030157048585656,
4.180158754905081,
19.132892088236673,
19.132892088236673,
26.239215809839333,
30.01393669097958,
8.49189812348647,
7.382910520180684,
4.9436457130181495,
0.6951522557178741,
0.0
],
"Electricity_price": [
0.000228,
@@ -715,103 +715,103 @@
"initial_soc_percentage": 5
},
"start_solution": [
7.0,
4.0,
11.0,
15.0,
13.0,
19.0,
8.0,
15.0,
5.0,
11.0,
1.0,
2.0,
8.0,
1.0,
2.0,
13.0,
14.0,
1.0,
9.0,
7.0,
9.0,
12.0,
12.0,
8.0,
13.0,
13.0,
7.0,
7.0,
6.0,
13.0,
7.0,
7.0,
10.0,
11.0,
12.0,
9.0,
9.0,
11.0,
11.0,
9.0,
10.0,
10.0,
11.0,
10.0,
8.0,
13.0,
11.0,
8.0,
0.0,
20.0,
20.0,
18.0,
5.0,
3.0,
5.0,
5.0,
1.0,
0.0,
6.0,
9.0,
16.0,
12.0,
13.0,
8.0,
4.0,
6.0,
0.0,
14.0,
11.0,
9.0,
16.0,
8.0,
9.0,
5.0,
10.0,
13.0,
13.0,
8.0,
8.0,
9.0,
5.0,
10.0,
7.0,
2.0,
8.0,
12.0,
2.0,
9.0,
11.0,
10.0,
10.0,
6.0,
1.0,
12.0,
9.0,
12.0,
13.0,
10.0,
13.0,
11.0,
2.0,
1.0,
3.0,
4.0,
3.0,
2.0,
2.0,
4.0,
1.0,
0.0,
2.0,
1.0,
0.0,
0.0,
2.0,
2.0,
3.0,
6.0,
2.0,
2.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.0,
0.0,
0.0,
0.0,
1.0,
0.0,
0.0,
3.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,
13.0
],
"washingstart": 13
}
}