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

Awattar Price changed to more precise value; if SoC=0 discharge =1 forced. Exp Avg for siple Price Forecast

Browse Source 
* Discharge Mask Bug, Tests updated, simple Price Forecast with linear weighting
 * Price Forecast with linear weighting, last value = highest weighting Discharge enforce when soc = 0 -> mask bug
This commit is contained in:
Andreas
2024-12-25 19:12:38 +01:00
committed by Dominique Lasserre
parent 9881fe6da1
commit 86d2173a4d
4 changed files with 488 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

472
tests/testdata/optimize_result_2_full.json vendored
View File

@@ -3,13 +3,14 @@
0.0,
0.0,
0.0,
1.0,
1.0,
0.0,
0.75,
0.0,
0.0,
0.375,
0.0,
1.0,
0.0,
0.5,
0.0,
0.0,
0.0,
@@ -18,7 +19,6 @@
0.0,
0.0,
0.0,
0.5,
0.0,
0.0,
0.0,
@@ -103,6 +103,12 @@
0,
1,
0,
1,
0,
1,
0,
0,
0,
0,
0,
0,
@@ -111,17 +117,20 @@
1,
0,
1,
1,
1,
0,
0,
0,
1,
1,
0,
1,
1,
0,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
1,
@@ -130,18 +139,9 @@
1,
0,
1,
1,
0,
1,
1,
0,
1,
1,
1,
1,
0,
0,
1,
1,
1,
1,
@@ -150,24 +150,24 @@
1
],
"eautocharge_hours_float": [
0.5,
0.375,
0.625,
0.0,
0.875,
1.0,
0.5,
0.75,
0.625,
0.5,
0.5,
0.375,
0.375,
0.75,
0.0,
0.5,
0.375,
0.0,
0.0,
0.5,
0.625,
0.625,
0.625,
0.5,
0.625,
0.5,
0.5,
0.0,
0.0,
0.0,
@@ -185,14 +185,14 @@
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,
@@ -202,15 +202,15 @@
"result": {
"Last_Wh_pro_Stunde": [
4986.07,
1063.91,
1320.56,
8876.029999999999,
8907.67,
7731.82,
6460.22,
6307.91,
7875.5599999999995,
7687.03,
7718.67,
6420.82,
7771.22,
6347.78,
3629.12,
1178.71,
3678.71,
1050.98,
988.56,
912.38,
@@ -226,14 +226,14 @@
1141.98,
1056.97,
992.46,
5088.99,
1155.99,
827.01,
1257.98,
1232.67,
4804.26,
871.26,
860.88,
1158.03,
7777.72,
1222.72,
1221.04,
949.99,
987.01,
@@ -243,37 +243,37 @@
"EAuto_SoC_pro_Stunde": [
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,
31.22,
42.144999999999996,
53.06999999999999,
61.809999999999995,
72.735,
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,11 +320,16 @@
0.0,
0.0
],
"Gesamt_Verluste": 7755.845910804702,
"Gesamtbilanz_Euro": 4.690157296412734,
"Gesamt_Verluste": 7087.636815800874,
"Gesamtbilanz_Euro": 5.921655371576468,
"Gesamteinnahmen_Euro": 0.0,
"Gesamtkosten_Euro": 4.690157296412734,
"Gesamtkosten_Euro": 5.921655371576468,
"Home_appliance_wh_per_hour": [
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
@@ -357,92 +362,87 @@
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0
],
"Kosten_Euro_pro_Stunde": [
0.92472012,
1.164542792,
1.416714026,
1.226111386,
0.0,
0.1807107,
0.0,
0.0,
1.4495244859999996,
0.53097063,
0.44343509999999997,
0.0,
0.0,
0.8107800974767518,
0.0,
0.0,
0.291163892,
0.7558691399999999,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.182970359,
0.0,
0.0,
0.26411047,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.13629985200000028,
0.08545095,
0.007989913613567745,
0.012219458233588571,
0.0,
0.002459704740224363,
0.010682755832597498,
0.0,
0.0,
0.05016012000000004,
0.0076430797975209205,
0.0,
0.31687880399999996,
0.0003442778967139274,
0.0,
0.0,
0.0,
0.16722497978466921,
0.16484566
0.0,
0.0,
0.0,
0.0,
0.0
],
"Netzbezug_Wh_pro_Stunde": [
4055.79,
5264.66,
6768.82,
6525.34,
0.0,
901.75,
0.0,
0.0,
7714.339999999998,
2888.8500000000004,
2212.75,
0.0,
0.0,
2705.305630553059,
0.0,
0.0,
980.68,
3329.8199999999997,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
556.31,
0.0,
0.0,
799.85,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
448.06000000000085,
351.65,
35.04348076126204,
55.24167375040041,
0.0,
11.752053226107805,
56.853410498124,
0.0,
0.0,
250.30000000000018,
34.77288351920346,
0.0,
1057.3199999999997,
1.7179535764168035,
0.0,
0.0,
0.0,
572.4922279516235,
592.97
0.0,
0.0,
0.0,
0.0,
0.0
],
"Netzeinspeisung_Wh_pro_Stunde": [
0.0,
@@ -485,84 +485,84 @@
0.0
],
"Verluste_Pro_Stunde": [
760.062272727273,
2.817272727272737,
29.157272727272726,
276.0,
207.0,
276.0,
345.0,
615.5918181818183,
730.0663636363638,
373.0373243336329,
23.391818181818195,
345.0,
576.7977272727273,
276.0,
863.3645454545458,
276.0,
229.91590909090905,
364.30090909090904,
99.72409090909093,
0.0,
133.72909090909081,
124.41545454545451,
96.08318181818186,
70.41409090909087,
118.37045454545455,
94.68272727272722,
83.01681818181817,
0.0,
75.86045454545456,
66.66681818181814,
69.12409090909085,
109.0704545454546,
48.863181818181715,
0.0,
109.96227272727276,
47.952272727272714,
11.233982308648535,
682.1181818181817,
160.0271308670193,
21.962728535423857,
48.41330768174522,
161.62968357967037,
14.209990740225123,
538.2984000000038,
207.0,
255.8276539776955,
441.7178455708299,
260.56941082122324,
171.99990368477063,
1026.818181818182,
62.214291413756285,
35.132727272727266,
77.27590909090907,
134.59227272727276,
22.022423461142267,
0.0
100.08954545454549,
80.85954545454547
],
"akku_soc_pro_stunde": [
80.0,
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
80.0,
80.0,
80.0,
80.0,
72.68315254820936,
72.68315254820936,
56.320635330578504,
56.320635330578504,
49.063188705234154,
37.563791322314046,
34.41593491735537,
30.194688360881543,
26.26743285123967,
23.2345041322314,
21.011837121212118,
17.275396005509634,
14.286673553719003,
11.666193181818178,
9.27160812672176,
7.167226239669419,
4.9852789256198315,
1.5423984159779582,
0.0,
0.0,
0.3120550641291261,
1.07020564583707,
4.578139530578446,
4.9728614955846995,
19.925594828916292,
32.195534983661574,
39.152182037223575,
42.92690291836383,
43.42237043610133,
42.31338283279554,
39.87411802563301,
35.62562456833274,
32.46623235070188
],
"Electricity_price": [
0.000228,
@@ -715,72 +715,72 @@
"initial_soc_percentage": 5
},
"start_solution": [
14.0,
13.0,
0.0,
20.0,
20.0,
18.0,
5.0,
3.0,
9.0,
16.0,
12.0,
13.0,
8.0,
4.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,
13.0,
0.0,
9.0,
18.0,
12.0,
5.0,
15.0,
4.0,
20.0,
14.0,
2.0,
14.0,
3.0,
13.0,
14.0,
13.0,
2.0,
9.0,
8.0,
10.0,
12.0,
10.0,
9.0,
13.0,
9.0,
9.0,
9.0,
9.0,
9.0,
9.0,
9.0,
9.0,
9.0,
9.0,
9.0,
10.0,
14.0,
13.0,
2.0,
9.0,
9.0,
13.0,
12.0,
11.0,
2.0,
10.0,
9.0,
13.0,
1.0,
3.0,
0.0,
5.0,
6.0,
2.0,
4.0,
3.0,
2.0,
2.0,
1.0,
1.0,
4.0,
0.0,
2.0,
1.0,
0.0,
0.0,
2.0,
3.0,
3.0,
3.0,
2.0,
3.0,
2.0,
2.0,
0.0,
0.0,
0.0,
@@ -798,20 +798,20 @@
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,
13.0
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
18.0
],
"washingstart": 13
"washingstart": 18
}