diff --git a/src/akkudoktoreos/default.config.json b/src/akkudoktoreos/default.config.json index 2d9f1ac..f25916b 100644 --- a/src/akkudoktoreos/default.config.json +++ b/src/akkudoktoreos/default.config.json @@ -5,7 +5,7 @@ }, "eos": { "prediction_hours": 48, - "optimization_hours": 24, + "optimization_hours": 48, "penalty": 10, "available_charging_rates_in_percentage": [ 0.0, 0.375, 0.5, 0.625, 0.75, 0.875, 1.0 diff --git a/tests/test_class_optimize.py b/tests/test_class_optimize.py index 5c907fd..09dea5a 100644 --- a/tests/test_class_optimize.py +++ b/tests/test_class_optimize.py @@ -61,8 +61,8 @@ def test_optimize( opt_class = optimization_problem(tmp_config, fixed_seed=42) start_hour = 10 - if ngen > 10 and not is_full_run: - pytest.skip() + # if ngen > 10 and not is_full_run: + # pytest.skip() visualize_filename = str((DIR_TESTDATA / f"new_{fn_out}").with_suffix(".pdf")) diff --git a/tests/testdata/optimize_input_2.json b/tests/testdata/optimize_input_2.json index 9a715d6..0c1deb3 100644 --- a/tests/testdata/optimize_input_2.json +++ b/tests/testdata/optimize_input_2.json @@ -1,51 +1,54 @@ { - "ems": { - "preis_euro_pro_wh_akku": 0.0001, - "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 - ], - "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 - ], - "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 - ] - }, - "pv_akku": { - "kapazitaet_wh": 26400, - "start_soc_prozent": 80, - "min_soc_prozent": 15 - }, - "eauto": { - "kapazitaet_wh": 60000, - "lade_effizienz": 0.95, - "max_ladeleistung_w": 11040, - "start_soc_prozent": 5, - "min_soc_prozent": 80 - }, - "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 + "ems": { + "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.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 ], - "start_solution": null + "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 + ], + "strompreis_euro_pro_wh": [ + 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": { + "kapazitaet_wh": 26400, + "start_soc_prozent": 80, + "min_soc_prozent": 0 + }, + "eauto": { + "kapazitaet_wh": 60000, + "lade_effizienz": 0.95, + "max_ladeleistung_w": 11040, + "start_soc_prozent": 5, + "min_soc_prozent": 80 + }, + "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 + ], + "start_solution": null } diff --git a/tests/testdata/optimize_result_2_full.json b/tests/testdata/optimize_result_2_full.json index b3ba460..03c21ff 100644 --- a/tests/testdata/optimize_result_2_full.json +++ b/tests/testdata/optimize_result_2_full.json @@ -1,25 +1,24 @@ { "ac_charge": [ + 0.75, + 0.0, + 0.0, + 0.0, 0.0, 0.0, 0.0, 0.375, 0.0, - 0.875, - 0.0, - 0.375, - 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, + 0.75, + 0.0, + 0.0, + 0.75, + 0.0, + 0.0, 0.0, 0.0, 0.0, @@ -33,6 +32,7 @@ 0.0, 0.0, 0.0, + 0.5, 0.0, 0.0, 0.0, @@ -100,24 +100,28 @@ 1.0 ], "discharge_allowed": [ + 0, + 0, + 0, + 0, + 0, + 1, 1, 0, 1, 0, 1, - 0, + 1, 1, 0, 0, 1, 0, - 0, 1, - 0, - 0, 1, - 0, - 0, + 1, + 1, + 1, 1, 1, 1, @@ -130,18 +134,14 @@ 1, 0, 1, + 0, + 0, 1, 1, + 0, + 0, 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, + 0, 1, 1, 1, @@ -150,28 +150,24 @@ 1 ], "eautocharge_hours_float": [ - 0.625, - 0.875, - 0.875, - 0.375, - 0.0, - 1.0, - 0.75, - 1.0, - 0.0, - 0.375, 0.5, - 0.75, - 0.375, - 0.0, 0.5, 0.625, 1.0, - 0.625, - 0.0, - 0.0, - 0.0, - 0.0, + 0.0, + 0.375, + 0.0, + 0.5, + 0.75, + 1.0, + 0.0, + 0.375, + 1.0, + 0.0, + 0.75, + 0.375, + 0.0, + 0.375, 0.0, 0.0, 0.0, @@ -189,11 +185,15 @@ 0.0, 0.0, 0.0, + 0.5, + 0.0, + 0.5, 0.0, 0.0, 0.0, 0.0, 0.0, + 0.5, 0.0, 0.0, 0.0, @@ -201,14 +201,14 @@ ], "result": { "Last_Wh_pro_Stunde": [ - 6297.07, - 8929.91, - 5253.5599999999995, - 3632.0299999999997, - 8907.67, - 7731.82, - 11704.22, - 7658.78, + 1053.07, + 4996.91, + 11808.56, + 4882.03, + 9029.67, + 7609.82, + 7466.22, + 5036.78, 1129.12, 1178.71, 1050.98, @@ -223,57 +223,57 @@ 488.89, 506.91, 804.89, - 1141.98, + 3641.98, 1056.97, 992.46, - 1155.99, + 6399.99, 827.01, - 1257.98, + 6501.98, 1232.67, 871.26, 860.88, 1158.03, 1222.72, - 1221.04, + 6465.04, 949.99, 987.01, 733.99, 592.97 ], "EAuto_SoC_pro_Stunde": [ - 13.74, - 26.85, - 33.405, - 33.405, + 5.0, + 11.555, + 29.035, + 29.035, 42.144999999999996, - 53.06999999999999, - 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, + 48.699999999999996, + 48.699999999999996, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 55.254999999999995, + 63.995000000000005, + 63.995000000000005, + 72.735, + 72.735, + 72.735, + 72.735, + 72.735, + 72.735, 81.475, 81.475, 81.475, @@ -320,18 +320,18 @@ 0.0, 0.0 ], - "Gesamt_Verluste": 6757.733989740087, - "Gesamtbilanz_Euro": 6.952642478544519, + "Gesamt_Verluste": 10116.23845689936, + "Gesamtbilanz_Euro": 5.609399525190347, "Gesamteinnahmen_Euro": 0.0, - "Gesamtkosten_Euro": 6.952642478544519, + "Gesamtkosten_Euro": 5.609399525190347, "Home_appliance_wh_per_hour": [ 0.0, 0.0, 0.0, - 2500.0, - 2500.0, 0.0, 0.0, + 2500.0, + 2500.0, 0.0, 0.0, 0.0, @@ -365,14 +365,13 @@ 0.0 ], "Kosten_Euro_pro_Stunde": [ - 1.22362812, - 1.7445291920000001, 0.0, - 0.4641768859999999, - 0.53097063, 0.0, - 1.7000079319999999, - 1.0534661399999998, + 1.193390926, + 0.7064482052307314, + 0.5533942300000001, + 0.0, + 0.880004468, 0.0, 0.0, 0.0, @@ -383,36 +382,36 @@ 0.0, 0.0, 0.0, - 0.182970359, 0.0, 0.0, 0.0, 0.0, - 0.0326838476973626, + 0.0, + 1.005803838, + 0.0, 0.007989913613567745, - 0.012219458233588555, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, + 1.06069824, 0.0, + 0.012914366999999916, + 4.174095896658514e-14, + 0.0003442778967139274, 0.0, + 0.028137079449292023, 0.0, + 0.16027398000000012, 0.0, 0.0, 0.0, 0.0 ], "Netzbezug_Wh_pro_Stunde": [ - 5366.79, - 7886.66, 0.0, - 2470.3399999999997, - 2888.8500000000004, 0.0, - 7734.339999999999, - 4640.82, + 5701.82, + 3759.703061366319, + 3010.8500000000004, + 0.0, + 4003.66, 0.0, 0.0, 0.0, @@ -423,22 +422,23 @@ 0.0, 0.0, 0.0, - 556.31, 0.0, 0.0, 0.0, 0.0, - 134.50143085334403, + 0.0, + 3306.3900000000003, + 0.0, 35.04348076126204, - 55.24167375040034, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, + 4795.2, 0.0, + 68.72999999999956, + 2.270998855635753e-10, + 1.7179535764168035, 0.0, + 123.95189184710142, 0.0, + 501.6400000000003, 0.0, 0.0, 0.0, @@ -485,14 +485,14 @@ 0.0 ], "Verluste_Pro_Stunde": [ - 276.0, + 16.744090909090914, + 746.1354545454542, + 1233.818181818182, + 452.3948326360417, 414.0, - 772.4754545454543, - 0.0, - 276.0, - 646.7386363636365, - 552.0, - 345.0, + 492.1022727272725, + 450.0, + 482.2936363636363, 101.0335466817773, 23.391818181818195, 99.72409090909093, @@ -503,66 +503,66 @@ 118.37045454545455, 94.68272727272722, 83.01681818181817, - 0.0, + 75.86045454545456, 66.66681818181814, 69.12409090909085, 109.0704545454546, - 109.96227272727276, - 29.61116851999853, + 300.0, + 47.952272727272714, 11.233982308648535, - 48.41330768174524, + 276.0, 161.62968357967037, - 21.962728535423857, - 538.2984000000038, - 441.95211196761403, + 957.818181818182, + 538.2983999999728, + 441.7178455708299, 260.56941082122324, - 171.99990368477063, + 155.09737297834772, 62.214291413756285, - 35.132727272727266, + 957.818181818182, 77.27590909090907, 134.59227272727276, 100.08954545454549, 80.85954545454547 ], "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 + 79.4714617768595, + 62.45329717630854, + 40.931258608815426, + 53.49778173759437, + 53.49778173759437, + 44.49834131059713, + 56.998341310597134, + 48.308516930431836, + 49.4536123554777, + 48.71523425630414, + 45.56737785134547, + 41.34613129487165, + 37.41887578522978, + 34.38594706622151, + 32.16328005520223, + 28.42683893949975, + 25.438116487709117, + 22.81763611580829, + 20.42305106071187, + 18.318669173659533, + 16.136721859609946, + 12.693841349968071, + 21.027174683301403, + 19.51352971084961, + 19.82558477497874, + 19.82558477497874, + 23.333518659720113, + 1.8114800922269987, + 16.764213425559575, + 29.03415358030485, + 35.990800633866854, + 40.29906099437652, + 40.79452851211402, + 19.272489944620908, + 16.833225137458374, + 12.584731680158098, + 9.425339462527244, + 6.872954820653964 ], "Electricity_price": [ 0.000228, @@ -715,72 +715,72 @@ "start_soc_prozent": 5 }, "start_solution": [ + 18.0, + 3.0, + 2.0, + 1.0, + 1.0, + 8.0, + 10.0, + 15.0, + 13.0, + 20.0, + 12.0, + 9.0, + 13.0, + 18.0, + 0.0, 7.0, - 4.0, + 18.0, + 7.0, + 9.0, + 9.0, + 10.0, + 12.0, + 10.0, 11.0, - 15.0, 13.0, - 19.0, 8.0, - 15.0, + 12.0, + 12.0, + 10.0, + 10.0, + 7.0, + 8.0, + 16.0, + 12.0, + 6.0, + 0.0, + 12.0, + 13.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, - 3.0, 5.0, - 5.0, - 1.0, - 0.0, - 6.0, - 4.0, - 6.0, - 0.0, - 1.0, + 13.0, + 8.0, + 10.0, + 10.0, + 9.0, + 7.0, 2.0, - 4.0, - 1.0, - 0.0, 2.0, 3.0, 6.0, - 3.0, + 0.0, + 1.0, + 0.0, + 2.0, + 4.0, + 6.0, + 0.0, + 1.0, + 6.0, + 0.0, + 4.0, + 1.0, + 0.0, + 1.0, 0.0, 0.0, 0.0, @@ -798,20 +798,20 @@ 0.0, 0.0, 0.0, + 2.0, + 0.0, + 2.0, 0.0, 0.0, 0.0, 0.0, 0.0, + 2.0, 0.0, 0.0, 0.0, 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 13.0 + 15.0 ], - "washingstart": 13 + "washingstart": 15 } \ No newline at end of file