From afa5cc7c021867836c2090c58fa354b3accc683f Mon Sep 17 00:00:00 2001 From: Dominique Lasserre Date: Sat, 21 Dec 2024 18:05:31 +0100 Subject: [PATCH] input data: Fix indentation * Comment full_run (use pytest --full-run to activate) --- tests/test_class_optimize.py | 5 +- tests/testdata/optimize_input_2.json | 271 ++++++++++++++++++++++----- 2 files changed, 223 insertions(+), 53 deletions(-) diff --git a/tests/test_class_optimize.py b/tests/test_class_optimize.py index 09dea5a..4a9d808 100644 --- a/tests/test_class_optimize.py +++ b/tests/test_class_optimize.py @@ -61,8 +61,9 @@ 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() + # Activate with pytest --full-run + 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 0c1deb3..3a01eb8 100644 --- a/tests/testdata/optimize_input_2.json +++ b/tests/testdata/optimize_input_2.json @@ -1,54 +1,223 @@ { - "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 + "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 + ], + "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 ], - "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 + "start_solution": null }