diff --git a/tests/test_class_ems_2.py b/tests/test_class_ems_2.py index c4e2fe8..11de678 100644 --- a/tests/test_class_ems_2.py +++ b/tests/test_class_ems_2.py @@ -225,7 +225,7 @@ def test_simulation(create_ems_instance): abs(result["akku_soc_pro_stunde"][20] - 98) < 1e-5 ), "'akku_soc_pro_stunde[11]' should be 98." assert ( - abs(result["Last_Wh_pro_Stunde"][20] - 5450.98) < 1e-3 + abs(result["Last_Wh_pro_Stunde"][20] - 6050.98) < 1e-3 ), "'Netzeinspeisung_Wh_pro_Stunde[11]' should be 0.0." print("All tests passed successfully.") diff --git a/tests/testdata/optimize_result_2.json b/tests/testdata/optimize_result_2.json index e7ff510..b9d4902 100644 --- a/tests/testdata/optimize_result_2.json +++ b/tests/testdata/optimize_result_2.json @@ -1,45 +1,45 @@ { "ac_charge": [ - 0.0, 0.0, 0.6, 0.4, 0.0, 0.4, 0.0, 0.8, 1.0, 0.6, 0.0, 0.4, 1.0, 0.6, 1.0, 0.0, 1.0, 1.0, 0.0, 0.0, 0.4, 0.6, 0.0, 0.4, 0.2, 0.6, 0.6, 0.2, 0.4, 0.2, 0.0, 0.0, 0.2, 0.6, 0.0, 0.0, 1.0, 1.0, 0.2, 0.0, 0.6, 0.4, 0.4, 0.2, 1.0, 0.6, 0.0, 0.0 + 0.0, 0.0, 0.2, 0.4, 0.0, 0.4, 0.0, 0.8, 1.0, 0.6, 0.0, 0.8, 1.0, 0.6, 1.0, 0.0, 0.4, 1.0, 0.8, 0.2, 0.0, 1.0, 0.8, 0.8, 0.4, 0.6, 0.2, 0.6, 0.2, 0.8, 0.2, 0.0, 1.0, 0.8, 0.4, 0.0, 1.0, 1.0, 0.2, 0.0, 1.0, 0.4, 0.6, 0.2, 1.0, 0.6, 0.0, 0.0 ], "dc_charge": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], "discharge_allowed": [ - 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1 + 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 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, 1 ], "eautocharge_hours_float": [ - 0.0, 0.375, 0.875, 0.375, 0.5, 0.75, 1.0, 1.0, 0.875, 0.0, 0.5, 0.375, 1.0, 0.875, 1.0, 0.625, 0.5, 1.0, 1.0, 0.375, 0.375, 0.375, 0.0, 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.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 + 0.0, 0.375, 0.875, 0.375, 0.5, 0.75, 1.0, 1.0, 0.875, 0.0, 1.0, 0.375, 0.75, 1.0, 1.0, 0.625, 0.5, 1.0, 1.0, 0.375, 0.375, 0.375, 0.75, 0.5, 1.0, 0.875, 0.875, 0.5, 0.75, 0.0, 0.875, 0.875, 0.5, 0.75, 0.75, 0.375, 0.75, 0.375, 1.0, 1.0, 0.625, 0.75, 0.5, 0.375, 0.625, 0.0, 0.0, 0.0 ], "result": { "Last_Wh_pro_Stunde": [ - 6297.07, 6756.91, 16208.56, 15449.029999999999, 16313.488181818184, 7731.82, 6460.22, 6974.78, 1129.12, 1178.71, 1050.98, 988.56, 912.38, 1741.405454545456, 516.37, 868.05, 694.34, 608.79, 556.31, 488.89, 506.91, 804.89, 1718.014090909092, 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 + 11541.07, 8996.91, 14186.56, 17120.03, 14608.281570247937, 7731.82, 6460.22, 3041.7799999999997, 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 ], "Netzeinspeisung_Wh_pro_Stunde": [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 813.95, 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, 128.65999999999985, 448.79999999999995, 1330.3700000000001, 175.26999999999998, 4485.82, 3682.7, 2166.67, 1416.43, 497.68000000000006, 0.0, 0.0, 0.0, 0.0, 0.0 ], "Netzbezug_Wh_pro_Stunde": [ - 366.78999999999996, 5713.66, 15101.82, 14287.339999999998, 10294.668181818184, 2212.75, 2490.34, 3956.8199999999997, 0.0, 171.54000000000008, 731.31, 980.68, 0.0, 1741.405454545456, 516.37, 868.05, 694.34, 608.79, 556.31, 488.89, 0.0, 799.85, 1382.424090909092, 351.65, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 257.64, 566.69, 987.01, 0.0, 0.0 + 5610.789999999999, 7953.66, 13079.82, 15958.339999999998, 8589.461570247937, 2212.75, 2490.34, 23.81999999999971, 0.0, 171.54000000000008, 731.31, 980.68, 912.38, 704.61, 516.37, 868.05, 694.34, 608.79, 556.31, 488.89, 506.91, 799.85, 806.3900000000001, 351.65, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 257.64, 566.69, 987.01, 0.0, 0.0 ], "Kosten_Euro_pro_Stunde": [ - 0.08362812, 1.263861592, 3.160810926, 2.6845911859999996, 1.8921600118181823, 0.44343509999999997, 0.547376732, 0.8981981399999999, 0.0, 0.05480703000000003, 0.225316611, 0.291163892, 0.0, 0.48411071636363673, 0.174739608, 0.28801899, 0.22802125600000003, 0.199865757, 0.182970359, 0.162995926, 0.0, 0.26411047, 0.42053340845454584, 0.08545095, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.08231598, 0.174597189, 0.293043269, 0.0, 0.0 + 1.2792601199999998, 1.759349592, 2.737606326, 2.9985720859999994, 1.5787430366115707, 0.44343509999999997, 0.547376732, 0.005407139999999934, 0.0, 0.05480703000000003, 0.225316611, 0.291163892, 0.26650619799999997, 0.19588158, 0.174739608, 0.28801899, 0.22802125600000003, 0.199865757, 0.182970359, 0.162995926, 0.16677339, 0.26411047, 0.24530383800000005, 0.08545095, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.08231598, 0.174597189, 0.293043269, 0.0, 0.0 ], "akku_soc_pro_stunde": [ - 58.47796143250689, 65.14462809917354, 81.81129476584022, 91.81129476584022, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 96.07274449035812, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 97.8180526859504, 97.8180526859504, 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, 96.84060778236915, 94.28822314049587 + 58.47796143250689, 71.81129476584022, 88.47796143250687, 98.47796143250687, 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, 100.0, 100.0, 100.0, 100.0, 100.0, 96.84060778236915, 94.28822314049587 ], "Einnahmen_Euro_pro_Stunde": [ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0569765, 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.009006199999999989, 0.03141599999999999, 0.0931259, 0.012268899999999998, 0.31400739999999994, 0.257789, 0.1516669, 0.09915009999999999, 0.0348376, 0.0, 0.0, 0.0, 0.0, 0.0 ], - "Gesamtbilanz_Euro": 13.525878719636365, + "Gesamtbilanz_Euro": 13.87138792561157, "EAuto_SoC_pro_Stunde": [ - 13.74, 20.294999999999998, 37.775, 53.06999999999999, 70.55, 81.475, 90.215, 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, 100.0, 100.0, 100.0, 100.0 + 22.48, 29.035, 42.144999999999996, 59.62499999999999, 77.105, 88.03, 96.77, 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, 100.0, 100.0, 100.0, 100.0 ], "Gesamteinnahmen_Euro": 1.0602444999999998, - "Gesamtkosten_Euro": 14.586123219636365, + "Gesamtkosten_Euro": 14.93163242561157, "Verluste_Pro_Stunde": [ - 957.818181818182, 447.0, 1152.0, 843.0, 846.7933884297522, 345.0, 276.0, 309.0, 0.0, 0.0, 0.0, 0.0, 124.41545454545451, 141.38119834710756, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 69.12409090909085, 0.0, 78.55010330578523, 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, 100.08954545454549, 80.85954545454547 + 1233.818181818182, 687.0, 1014.0, 912.0, 606.7933884297523, 345.0, 276.0, 102.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, 100.08954545454549, 80.85954545454547 ], - "Gesamt_Verluste": 5771.031508264463, + "Gesamt_Verluste": 5357.560661157026, "Home_appliance_wh_per_hour": [ 0.0, 0.0, 0.0, 2500.0, 2500.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, 0.0, 0.0, 0.0 @@ -61,7 +61,7 @@ "max_ladeleistung_w": 11040 }, "start_solution": [ - 0, 0, 4, 3, 1, 3, 1, 5, 6, 4, 1, 3, 6, 4, 6, 0, 6, 6, 0, 0, 3, 4, 1, 3, 2, 4, 4, 2, 3, 2, 1, 0, 2, 4, 1, 0, 6, 6, 2, 0, 4, 3, 3, 2, 6, 4, 1, 1, 0, 1, 5, 1, 2, 4, 6, 6, 5, 0, 2, 1, 6, 5, 6, 3, 2, 6, 6, 1, 1, 1, 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, 13 + 0.0, 0.0, 2.0, 3.0, 1.0, 3.0, 1.0, 5.0, 6.0, 4.0, 1.0, 5.0, 6.0, 4.0, 6.0, 0.0, 3.0, 6.0, 5.0, 2.0, 0.0, 6.0, 5.0, 5.0, 3.0, 4.0, 2.0, 4.0, 2.0, 5.0, 2.0, 0.0, 6.0, 5.0, 3.0, 0.0, 6.0, 6.0, 2.0, 0.0, 6.0, 3.0, 4.0, 2.0, 6.0, 4.0, 1.0, 1.0, 0.0, 1.0, 5.0, 1.0, 2.0, 4.0, 6.0, 6.0, 5.0, 0.0, 6.0, 1.0, 4.0, 6.0, 6.0, 3.0, 2.0, 6.0, 6.0, 1.0, 1.0, 1.0, 4.0, 2.0, 6.0, 5.0, 5.0, 2.0, 4.0, 0.0, 5.0, 5.0, 2.0, 4.0, 4.0, 1.0, 4.0, 1.0, 6.0, 6.0, 3.0, 4.0, 2.0, 1.0, 3.0, 0.0, 0.0, 0.0, 13.0 ], "washingstart": 13 -} \ No newline at end of file +}