From 9dcb88881b5d2454ac2c6ae5a1c271cfad0315fd Mon Sep 17 00:00:00 2001 From: Andreas Date: Sat, 21 Dec 2024 14:50:43 +0100 Subject: [PATCH] Test Update with new algorithm --- tests/testdata/optimize_result_2_full.json | 520 ++++++++++----------- 1 file changed, 260 insertions(+), 260 deletions(-) diff --git a/tests/testdata/optimize_result_2_full.json b/tests/testdata/optimize_result_2_full.json index 1e4999c..b3ba460 100644 --- a/tests/testdata/optimize_result_2_full.json +++ b/tests/testdata/optimize_result_2_full.json @@ -1,19 +1,21 @@ { "ac_charge": [ - 0.5, + 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.75, 0.0, - 0.5, - 0.0, - 1.0, - 0.0, - 0.0, - 0.75, - 0.75, 0.0, 0.0, 0.0, @@ -30,7 +32,6 @@ 0.0, 0.0, 0.0, - 0.75, 0.0, 0.0, 0.0, @@ -40,7 +41,6 @@ 0.0, 0.0, 0.0, - 0.625, 0.0, 0.0, 0.0, @@ -100,23 +100,27 @@ 1.0 ], "discharge_allowed": [ - 0, - 1, 1, 0, + 1, 0, + 1, 0, - 0, - 0, + 1, 0, 0, 1, 0, 0, + 1, 0, 0, 1, 0, + 0, + 1, + 1, + 1, 1, 1, 1, @@ -127,49 +131,45 @@ 0, 1, 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, 1, 1, - 0, - 0, 1, - 0, - 0, - 0, - 0, - 0, - 0 + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1 ], "eautocharge_hours_float": [ - 0.875, - 0.75, - 0.875, - 0.5, - 0.375, - 0.75, - 0.875, 0.625, - 0.375, - 0.5, + 0.875, + 0.875, 0.375, 0.0, - 0.875, + 1.0, + 0.75, + 1.0, + 0.0, + 0.375, 0.5, 0.75, - 0.625, - 0.875, + 0.375, 0.0, 0.5, 0.625, + 1.0, + 0.625, + 0.0, + 0.0, 0.0, 0.0, 0.0, @@ -201,16 +201,16 @@ ], "result": { "Last_Wh_pro_Stunde": [ - 4986.07, - 1063.91, - 14247.56, - 12626.029999999999, - 11529.67, + 6297.07, + 8929.91, + 5253.5599999999995, + 3632.0299999999997, + 8907.67, 7731.82, - 10393.22, - 1103.78, - 6373.12, - 7733.71, + 11704.22, + 7658.78, + 1129.12, + 1178.71, 1050.98, 988.56, 912.38, @@ -221,7 +221,7 @@ 608.79, 556.31, 488.89, - 4256.91, + 506.91, 804.89, 1141.98, 1056.97, @@ -231,7 +231,7 @@ 1257.98, 1232.67, 871.26, - 3985.88, + 860.88, 1158.03, 1222.72, 1221.04, @@ -241,44 +241,44 @@ 592.97 ], "EAuto_SoC_pro_Stunde": [ - 11.555, - 11.555, + 13.74, 26.85, - 35.589999999999996, - 48.699999999999996, - 59.62499999999999, - 74.92, - 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 + 33.405, + 33.405, + 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, + 81.475, + 81.475, + 81.475, + 81.475, + 81.475 ], "Einnahmen_Euro_pro_Stunde": [ 0.0, @@ -320,10 +320,10 @@ 0.0, 0.0 ], - "Gesamt_Verluste": 9258.73062020124, - "Gesamtbilanz_Euro": 12.332782378812306, + "Gesamt_Verluste": 6757.733989740087, + "Gesamtbilanz_Euro": 6.952642478544519, "Gesamteinnahmen_Euro": 0.0, - "Gesamtkosten_Euro": 12.332782378812306, + "Gesamtkosten_Euro": 6.952642478544519, "Home_appliance_wh_per_hour": [ 0.0, 0.0, @@ -365,84 +365,84 @@ 0.0 ], "Kosten_Euro_pro_Stunde": [ + 1.22362812, + 1.7445291920000001, + 0.0, + 0.4641768859999999, + 0.53097063, + 0.0, + 1.7000079319999999, + 1.0534661399999998, + 0.0, + 0.0, 0.0, - 0.004569992000000018, - 2.750373626, - 2.1541494859999997, - 1.0128942300000001, 0.0, - 1.4118501319999999, - 0.0, - 0.0, - 0.55162953, 0.0, 0.0, 0.0, 0.0, - 0.174739608, 0.0, 0.0, - 0.199865757, 0.182970359, - 0.162995926, - 1.4005233899999998, - 0.26411047, - 0.24530383800000005, - 0.08545095, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0326838476973626, 0.007989913613567745, - 0.028255713342252034, - 0.025392879919306634, + 0.012219458233588555, 0.0, 0.0, - 0.0003442778967139274, - 0.6945180797975209, 0.0, - 0.04565364324294593, - 0.08231598, - 0.174597189, - 0.293043269, - 0.214398479, - 0.16484566 + 0.0, + 0.0, + 0.0, + 0.0, + 0.0, + 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, + 0.0, + 0.0, 0.0, - 20.660000000000082, - 13140.82, - 11464.339999999998, - 5510.85, 0.0, - 6423.339999999999, - 0.0, - 0.0, - 1726.54, 0.0, 0.0, 0.0, 0.0, - 516.37, 0.0, 0.0, - 608.79, 556.31, - 488.89, - 4256.91, - 799.85, - 806.3900000000001, - 351.65, + 0.0, + 0.0, + 0.0, + 0.0, + 134.50143085334403, 35.04348076126204, - 127.73830624887898, - 121.32288542430308, + 55.24167375040034, 0.0, 0.0, - 1.7179535764168035, - 3159.7728835192033, 0.0, - 152.3311419517715, - 257.64, - 566.69, - 987.01, - 733.99, - 592.97 + 0.0, + 0.0, + 0.0, + 0.0, + 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, - 0.0, - 933.0, - 726.0, + 276.0, 414.0, + 772.4754545454543, + 0.0, + 276.0, 646.7386363636365, - 483.0, - 230.91336797704525, - 880.0977272727268, - 1026.818181818182, + 552.0, + 345.0, + 101.0335466817773, + 23.391818181818195, 99.72409090909093, 133.72909090909081, 124.41545454545451, 96.08318181818186, - 0.0, + 70.41409090909087, 118.37045454545455, 94.68272727272722, + 83.01681818181817, 0.0, - 0.0, - 0.0, - 450.0, - 0.0, - 0.0, - 0.0, + 66.66681818181814, + 69.12409090909085, + 109.0704545454546, + 109.96227272727276, + 29.61116851999853, 11.233982308648535, - 38.52740325013451, - 145.08565374908358, + 48.41330768174524, + 161.62968357967037, 21.962728535423857, 538.2984000000038, - 441.7178455708299, - 630.8276539776955, + 441.95211196761403, + 260.56941082122324, 171.99990368477063, - 41.441862965787436, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 + 62.214291413756285, + 35.132727272727266, + 77.27590909090907, + 134.59227272727276, + 100.08954545454549, + 80.85954545454547 ], "akku_soc_pro_stunde": [ - 62.54222623966943, - 62.54222623966943, - 75.04222623966943, - 87.54222623966943, - 87.54222623966943, - 78.01764807162535, - 78.01764807162535, - 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 + 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 ], "Electricity_price": [ 0.000228, @@ -711,78 +711,78 @@ "kapazitaet_wh": 60000, "lade_effizienz": 0.95, "max_ladeleistung_w": 11040, - "soc_wh": 56751.0, + "soc_wh": 48885.0, "start_soc_prozent": 5 }, "start_solution": [ - 16.0, - 13.0, + 7.0, + 4.0, 11.0, - 14.0, - 2.0, - 18.0, - 3.0, - 16.0, - 4.0, - 20.0, - 12.0, - 2.0, - 18.0, - 18.0, - 1.0, + 15.0, 13.0, - 4.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, - 8.0, - 10.0, 12.0, - 10.0, - 10.0, - 14.0, + 12.0, 8.0, - 7.0, - 2.0, - 6.0, - 4.0, - 18.0, - 3.0, - 4.0, - 3.0, - 5.0, - 14.0, - 14.0, - 10.0, 13.0, - 3.0, - 17.0, - 11.0, + 13.0, + 7.0, + 7.0, 6.0, - 14.0, - 14.0, - 14.0, - 2.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, - 4.0, 5.0, - 2.0, - 1.0, - 4.0, - 5.0, - 3.0, - 1.0, - 2.0, 1.0, 0.0, - 5.0, + 6.0, + 4.0, + 6.0, + 0.0, + 1.0, 2.0, 4.0, - 3.0, - 5.0, + 1.0, 0.0, 2.0, 3.0, + 6.0, + 3.0, + 0.0, + 0.0, 0.0, 0.0, 0.0,