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

fix(optimization): add battery self-consumption state

Browse Source
This commit is contained in:
Andreas
2026-07-16 12:59:02 +02:00
parent 5b8f7de113
commit 6465e22f07
9 changed files with 310 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/testdata/new_optimize_15min.pdf
Vendored
BIN
View File
Binary file not shown.
tests/testdata/optimize_result_2.json
Vendored
+71 -71
View File
@@ -202,15 +202,15 @@
],
"result": {
"Last_Wh_pro_Stunde": [
10230.07,
7618.91,
7875.5599999999995,
7565.03,
12840.67,
9042.82,
9082.22,
5036.78,
2177.92,
10713.07,
7963.91,
8220.56,
7772.03,
13323.67,
9456.82,
9496.22,
5243.78,
2233.12,
1178.71,
1050.98,
988.56,
@@ -313,7 +313,7 @@
0.0,
0.0,
0.0,
0.05936927575872234,
0.053661230306193436,
0.05435777788576338,
0.0,
0.0,
@@ -322,9 +322,9 @@
0.0
],
"Gesamt_Verluste": 6227.580163897914,
"Gesamtbilanz_Euro": 11.420868526053463,
"Gesamteinnahmen_Euro": 0.11372705364448572,
"Gesamtkosten_Euro": 11.534595579697948,
"Gesamtbilanz_Euro": 12.033027623527284,
"Gesamteinnahmen_Euro": 0.10801900819195681,
"Gesamtkosten_Euro": 12.14104663171924,
"Home_appliance_wh_per_hour": [
0.0,
0.0,
@@ -408,15 +408,15 @@
]
},
"Kosten_Euro_pro_Stunde": [
2.1203521199999997,
1.4545721927072854,
1.4167558060312964,
1.2032659414129376,
1.2892826874611185,
0.770122611209644,
1.1459236583154115,
0.4965507655670841,
0.1912938683161112,
2.23047612,
1.5308798733801507,
1.4889564723943407,
1.242149738556099,
1.3742255912165289,
0.8479283355019763,
1.2336553365360492,
0.5407163922683618,
0.20558284318867343,
0.1614775630079859,
0.0,
0.0,
@@ -448,15 +448,15 @@
0.16484566
],
"Netzbezug_Wh_pro_Stunde": [
9299.789999999999,
6575.823656000386,
6769.01961792306,
6403.757005923032,
7014.595688036554,
3842.9272016449304,
5213.483431826258,
2187.4483064629258,
638.2845122326032,
9782.789999999999,
6920.795087613701,
7113.9821901306295,
6610.695787951565,
7476.74423948057,
4231.179318872138,
5612.626644840988,
2382.0105386271443,
685.962106068313,
505.40708296709204,
0.0,
0.0,
@@ -519,7 +519,7 @@
0.0,
0.0,
0.0,
848.1325108388907,
766.589004374192,
776.5396840823341,
0.0,
0.0,
@@ -529,14 +529,14 @@
],
"Verluste_Pro_Stunde": [
483.0,
345.0196387200463,
345.0239541507672,
207.05004071076388,
506.1294825643864,
452.3012641973916,
426.13721181915116,
227.23539677555112,
103.61214146791241,
345.0162105136441,
345.0194628156755,
207.04269455418785,
503.6273087376684,
449.2115182646565,
424.3543973809186,
225.74286463525735,
102.70945272819762,
40.06404995605101,
106.80230977350088,
133.7321802766326,
@@ -559,7 +559,7 @@
538.2984000000001,
441.9379674303641,
261.1952696860876,
75.0748095419566,
84.86003031772043,
0.0,
111.78035844493081,
90.18403329253945,
@@ -570,36 +570,36 @@
"akku_soc_pro_stunde": [
80.0,
80.0,
80.00054552000128,
80.00121091307815,
80.0026009328216,
80.6450865596101,
81.70901056509321,
82.04615533784741,
82.60824969272383,
83.95303140016584,
85.06592167672281,
81.89125383667168,
77.66999557804807,
77.66999557804807,
77.66999557804807,
75.44732856702878,
71.71088745132629,
68.72216499953565,
66.10168462763482,
63.7070995725384,
61.60271768548606,
59.42077037143647,
55.97788013048819,
52.48021001194556,
53.09999027665313,
54.60520137546928,
57.01140766586834,
61.59918181733974,
63.43037648171088,
78.38310981504422,
90.65916446588767,
97.91458862383455,
80.00045029204567,
80.00099092581443,
80.00217688565297,
80.57515768392155,
81.55325541349534,
81.8408775629653,
82.36151269172245,
83.68121971195016,
84.79410998850713,
81.619442148456,
77.39818388983241,
77.39818388983241,
77.39818388983241,
75.17551687881311,
71.43907576311062,
68.45035331131999,
65.82987293941916,
63.43528788432273,
61.33090599727039,
59.14895868322081,
55.706068442272525,
52.208398323729895,
52.82817858843747,
54.33338968725362,
56.73959597765268,
61.327370129124084,
63.158564793495216,
78.11129812682856,
90.387352777672,
97.64277693561888,
100.0,
100.0,
98.60068046043587,
tests/testdata/optimize_result_2_be.json
Vendored
+70 -70
View File
@@ -202,14 +202,14 @@
],
"result": {
"Last_Wh_pro_Stunde": [
11541.07,
6307.91,
9186.56,
10309.03,
6407.67,
5109.82,
11704.22,
5036.78,
12093.07,
6583.91,
9600.56,
10792.03,
6683.67,
5316.82,
12256.22,
5243.78,
1129.12,
1178.71,
1050.98,
@@ -321,10 +321,10 @@
0.0,
0.0
],
"Gesamt_Verluste": 7430.87215820259,
"Gesamtbilanz_Euro": 9.4881560601163,
"Gesamt_Verluste": 7415.050669156861,
"Gesamtbilanz_Euro": 10.086958235191952,
"Gesamteinnahmen_Euro": 0.0,
"Gesamtkosten_Euro": 9.4881560601163,
"Gesamtkosten_Euro": 10.086958235191952,
"Home_appliance_wh_per_hour": [
0.0,
0.0,
@@ -408,14 +408,14 @@
]
},
"Kosten_Euro_pro_Stunde": [
1.4160601199999998,
0.19137741085396395,
1.691123530177008,
1.7187910298948639,
0.20791005863613377,
0.09234842570092357,
1.709869129414328,
0.4965507655670841,
1.5419161199999998,
0.2524105556335792,
1.7777665549410084,
1.809540886,
0.24971825220475874,
0.12061259291950001,
1.83015129135275,
0.5407163922683618,
0.05258762370598476,
0.1614775630079859,
0.0,
@@ -448,14 +448,14 @@
0.16484566
],
"Netzbezug_Wh_pro_Stunde": [
6210.789999999999,
865.1781684175585,
8079.902198647912,
9147.371101090283,
1131.1755094457767,
460.8204875295587,
7779.204410438253,
2187.4483064629258,
6762.789999999999,
1141.0965444556023,
8493.867916583891,
9630.34,
1358.64119806724,
601.8592461052895,
8326.43899614536,
2382.0105386271443,
175.4675465665157,
505.40708296709204,
0.0,
@@ -529,13 +529,13 @@
],
"Verluste_Pro_Stunde": [
1152.0,
876.0621802101069,
414.00986383774955,
483.00373213083384,
365.07906113349316,
311.4084585035471,
557.3837292525905,
227.23539677555112,
876.0523853346722,
414.00574999006693,
483.0,
359.25494376806876,
303.4931095326348,
556.8118795374434,
225.74286463525735,
118.73010558798194,
40.06404995605101,
106.80230977350088,
@@ -570,42 +570,42 @@
"akku_soc_pro_stunde": [
80.0,
61.06060606060606,
42.12293934927065,
42.12321334476369,
42.123317015064636,
44.59773537988389,
47.49797033831576,
47.64751837310994,
48.209612727986354,
51.507671216541404,
52.620561493098386,
49.44589365304724,
45.224635394423636,
45.224635394423636,
45.224635394423636,
43.00196838340435,
39.26552726770188,
36.27680481591124,
33.656324444010416,
31.261739388913995,
29.157357501861657,
26.97541018781207,
23.53251994686378,
20.034849828321157,
20.654630093028718,
22.159841191844876,
24.566047482243945,
29.15382163371534,
29.229581775454538,
35.84898177545453,
48.12503642629798,
55.38046058424485,
60.29298032987328,
61.68112016833327,
62.6777205736456,
60.18956135662841,
55.94106789932813,
55.94106789932813
42.12266726939745,
42.122826991343764,
42.122826991343764,
44.435464318234565,
47.11582847191886,
47.249491792403404,
47.770126921160546,
51.0681854097156,
52.181075686272585,
49.006407846221435,
44.78514958759783,
44.78514958759783,
44.78514958759783,
42.562482576578546,
38.82604146087607,
35.837319009085434,
33.2168386371846,
30.822253582088187,
28.717871695035846,
26.53592438098626,
23.09303414003797,
19.595364021495346,
20.215144286202914,
21.72035538501907,
24.126561675418138,
28.71433582688953,
28.79009596862873,
35.40949596862873,
47.68555061947217,
54.94097477741905,
59.85349452304748,
61.241634361507465,
62.2382347668198,
59.7500755498026,
55.50158209250233,
55.50158209250233
],
"Electricity_price": [
0.000228,