diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_0/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_0/data/cls_params/GridModule/time_series.csv.gz index 4cad091b..7d382ae0 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_0/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_0/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_0/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_0/data/cls_params/LoadModule/time_series.csv.gz index e615372f..f563112c 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_0/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_0/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_0/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_0/data/cls_params/RenewableModule/time_series.csv.gz index f1b321f0..119b6d93 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_0/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_0/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_0/microgrid_0.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_0/microgrid_0.yaml index 6391a58f..dda1e42e 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_0/microgrid_0.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_0/microgrid_0.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_1/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_1/data/cls_params/GridModule/time_series.csv.gz index d0cfdbf6..91ef0807 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_1/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_1/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_1/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_1/data/cls_params/LoadModule/time_series.csv.gz index 9cf1e93a..6839bfab 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_1/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_1/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_1/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_1/data/cls_params/RenewableModule/time_series.csv.gz index ae71a19c..72131bc1 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_1/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_1/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_1/microgrid_1.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_1/microgrid_1.yaml index 7d759d7f..7d8d82f2 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_1/microgrid_1.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_1/microgrid_1.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_10/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_10/data/cls_params/GridModule/time_series.csv.gz index 9e39fe9c..522e293b 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_10/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_10/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_10/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_10/data/cls_params/LoadModule/time_series.csv.gz index 0e2386c7..7fb308c8 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_10/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_10/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_10/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_10/data/cls_params/RenewableModule/time_series.csv.gz index c514665a..1273f442 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_10/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_10/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_10/microgrid_10.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_10/microgrid_10.yaml index 5ed6998f..03c485a7 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_10/microgrid_10.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_10/microgrid_10.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_11/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_11/data/cls_params/GridModule/time_series.csv.gz index 8818dcbe..5c430535 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_11/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_11/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_11/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_11/data/cls_params/LoadModule/time_series.csv.gz index 1d1e3f0f..29c8c09f 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_11/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_11/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_11/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_11/data/cls_params/RenewableModule/time_series.csv.gz index 962d072b..81c9a1f5 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_11/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_11/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_11/microgrid_11.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_11/microgrid_11.yaml index e82b662d..b44b3879 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_11/microgrid_11.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_11/microgrid_11.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_12/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_12/data/cls_params/GridModule/time_series.csv.gz index 9e39fe9c..522e293b 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_12/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_12/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_12/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_12/data/cls_params/LoadModule/time_series.csv.gz index 89e1dd12..bfbce2f9 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_12/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_12/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_12/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_12/data/cls_params/RenewableModule/time_series.csv.gz index dc0b0d34..feb90efb 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_12/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_12/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_12/microgrid_12.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_12/microgrid_12.yaml index aadaad4b..bf684b08 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_12/microgrid_12.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_12/microgrid_12.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_13/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_13/data/cls_params/GridModule/time_series.csv.gz index 206ef5b5..0abd9db3 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_13/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_13/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_13/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_13/data/cls_params/LoadModule/time_series.csv.gz index 67b80e6b..995a4d3a 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_13/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_13/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_13/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_13/data/cls_params/RenewableModule/time_series.csv.gz index 212d877d..62c72b6e 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_13/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_13/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_13/microgrid_13.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_13/microgrid_13.yaml index 4c7ab601..43c529d0 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_13/microgrid_13.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_13/microgrid_13.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_14/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_14/data/cls_params/GridModule/time_series.csv.gz index e910351c..6e7dcb53 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_14/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_14/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_14/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_14/data/cls_params/LoadModule/time_series.csv.gz index 20b993e2..1533fcd3 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_14/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_14/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_14/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_14/data/cls_params/RenewableModule/time_series.csv.gz index 8a7ead93..2cb834c4 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_14/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_14/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_14/microgrid_14.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_14/microgrid_14.yaml index f68491e0..7eb29e8c 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_14/microgrid_14.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_14/microgrid_14.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_15/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_15/data/cls_params/LoadModule/time_series.csv.gz index ed18db37..1604afd4 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_15/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_15/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_15/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_15/data/cls_params/RenewableModule/time_series.csv.gz index 5394e510..3e18e98d 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_15/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_15/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_15/microgrid_15.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_15/microgrid_15.yaml index 1d25a6ba..063b5e83 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_15/microgrid_15.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_15/microgrid_15.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_16/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_16/data/cls_params/GridModule/time_series.csv.gz index 2e8862c4..d736cf7b 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_16/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_16/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_16/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_16/data/cls_params/LoadModule/time_series.csv.gz index e3e874b5..586a6514 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_16/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_16/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_16/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_16/data/cls_params/RenewableModule/time_series.csv.gz index 1db570ea..22a4bf63 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_16/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_16/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_16/microgrid_16.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_16/microgrid_16.yaml index 4def6f3f..1dec320f 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_16/microgrid_16.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_16/microgrid_16.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_17/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_17/data/cls_params/LoadModule/time_series.csv.gz index 3ac17395..6311564a 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_17/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_17/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_17/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_17/data/cls_params/RenewableModule/time_series.csv.gz index 98448f8f..302892e9 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_17/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_17/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_17/microgrid_17.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_17/microgrid_17.yaml index e6aea3fb..e802155a 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_17/microgrid_17.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_17/microgrid_17.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_18/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_18/data/cls_params/GridModule/time_series.csv.gz index 5eeb4f4d..110c581e 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_18/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_18/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_18/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_18/data/cls_params/LoadModule/time_series.csv.gz index 4dbff8ed..7d3f6e91 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_18/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_18/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_18/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_18/data/cls_params/RenewableModule/time_series.csv.gz index 355a6768..db092713 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_18/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_18/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_18/microgrid_18.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_18/microgrid_18.yaml index 3460c366..01387e39 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_18/microgrid_18.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_18/microgrid_18.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_19/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_19/data/cls_params/LoadModule/time_series.csv.gz index d2c57479..0cfb947d 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_19/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_19/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_19/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_19/data/cls_params/RenewableModule/time_series.csv.gz index 81591d4d..ec173b96 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_19/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_19/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_19/microgrid_19.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_19/microgrid_19.yaml index bd6e0c2f..acd15059 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_19/microgrid_19.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_19/microgrid_19.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_2/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_2/data/cls_params/LoadModule/time_series.csv.gz index 1f5a154a..6a9ae17b 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_2/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_2/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_2/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_2/data/cls_params/RenewableModule/time_series.csv.gz index a95bf059..715b0171 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_2/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_2/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_2/microgrid_2.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_2/microgrid_2.yaml index 6edbb320..7ceff26a 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_2/microgrid_2.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_2/microgrid_2.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_20/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_20/data/cls_params/LoadModule/time_series.csv.gz index 10261a89..655db7f7 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_20/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_20/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_20/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_20/data/cls_params/RenewableModule/time_series.csv.gz index a45939e0..3c953bf7 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_20/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_20/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_20/microgrid_20.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_20/microgrid_20.yaml index e91f2b56..62f912a3 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_20/microgrid_20.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_20/microgrid_20.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_21/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_21/data/cls_params/LoadModule/time_series.csv.gz index 78bb0d88..731b91fa 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_21/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_21/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_21/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_21/data/cls_params/RenewableModule/time_series.csv.gz index ccae0fcc..7efd4755 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_21/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_21/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_21/microgrid_21.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_21/microgrid_21.yaml index 1192be9d..c55dbf77 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_21/microgrid_21.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_21/microgrid_21.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_22/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_22/data/cls_params/GridModule/time_series.csv.gz index 5eeb4f4d..0158236f 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_22/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_22/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_22/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_22/data/cls_params/LoadModule/time_series.csv.gz index 7fa9b1ec..87dbc400 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_22/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_22/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_22/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_22/data/cls_params/RenewableModule/time_series.csv.gz index efefd2d8..a2725fa7 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_22/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_22/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_22/microgrid_22.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_22/microgrid_22.yaml index 9ef6f499..2720c0e5 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_22/microgrid_22.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_22/microgrid_22.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_23/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_23/data/cls_params/LoadModule/time_series.csv.gz index a5d640e5..6fefe6d7 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_23/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_23/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_23/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_23/data/cls_params/RenewableModule/time_series.csv.gz index cf57e1ed..880c1ed7 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_23/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_23/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_23/microgrid_23.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_23/microgrid_23.yaml index 3c22cee7..5cdf046e 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_23/microgrid_23.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_23/microgrid_23.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_24/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_24/data/cls_params/GridModule/time_series.csv.gz index 09d2abac..ef7b83ed 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_24/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_24/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_24/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_24/data/cls_params/LoadModule/time_series.csv.gz index 98f549ec..d442b780 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_24/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_24/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_24/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_24/data/cls_params/RenewableModule/time_series.csv.gz index 25c27a13..2aeeaa0c 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_24/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_24/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_24/microgrid_24.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_24/microgrid_24.yaml index 682c61de..77ad2fc0 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_24/microgrid_24.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_24/microgrid_24.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_3/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_3/data/cls_params/LoadModule/time_series.csv.gz index 36a3c2a5..480bba5c 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_3/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_3/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_3/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_3/data/cls_params/RenewableModule/time_series.csv.gz index ab70b6d7..42b45fc7 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_3/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_3/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_3/microgrid_3.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_3/microgrid_3.yaml index 09942c94..024f6baa 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_3/microgrid_3.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_3/microgrid_3.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_4/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_4/data/cls_params/GridModule/time_series.csv.gz index ba20c009..52c612a3 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_4/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_4/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_4/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_4/data/cls_params/LoadModule/time_series.csv.gz index 451887d1..3cd0f64e 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_4/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_4/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_4/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_4/data/cls_params/RenewableModule/time_series.csv.gz index 34b00454..ceaed11d 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_4/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_4/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_4/microgrid_4.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_4/microgrid_4.yaml index d11e06b6..132b7b53 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_4/microgrid_4.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_4/microgrid_4.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_5/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_5/data/cls_params/LoadModule/time_series.csv.gz index 904a2581..25af3191 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_5/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_5/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_5/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_5/data/cls_params/RenewableModule/time_series.csv.gz index b12d119f..5fed3c89 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_5/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_5/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_5/microgrid_5.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_5/microgrid_5.yaml index 861fecff..c8aaf96e 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_5/microgrid_5.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_5/microgrid_5.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_6/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_6/data/cls_params/GridModule/time_series.csv.gz index 03f25ed7..1f4778c5 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_6/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_6/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_6/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_6/data/cls_params/LoadModule/time_series.csv.gz index b9da4faa..c0a89ab7 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_6/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_6/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_6/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_6/data/cls_params/RenewableModule/time_series.csv.gz index 51470d15..2706bf20 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_6/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_6/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_6/microgrid_6.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_6/microgrid_6.yaml index 5d36d64c..e4cabde8 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_6/microgrid_6.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_6/microgrid_6.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_7/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_7/data/cls_params/LoadModule/time_series.csv.gz index a0151dd8..11686b10 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_7/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_7/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_7/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_7/data/cls_params/RenewableModule/time_series.csv.gz index f73a2218..ac61228f 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_7/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_7/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_7/microgrid_7.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_7/microgrid_7.yaml index d239ec3b..db392650 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_7/microgrid_7.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_7/microgrid_7.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_8/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_8/data/cls_params/GridModule/time_series.csv.gz index 122ae1df..a7c42c92 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_8/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_8/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_8/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_8/data/cls_params/LoadModule/time_series.csv.gz index 2ba1ac9b..d2a6b31d 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_8/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_8/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_8/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_8/data/cls_params/RenewableModule/time_series.csv.gz index b0292442..4db439d8 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_8/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_8/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_8/microgrid_8.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_8/microgrid_8.yaml index 511f56a7..02fdbbaf 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_8/microgrid_8.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_8/microgrid_8.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_9/data/cls_params/GridModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_9/data/cls_params/GridModule/time_series.csv.gz index fe93ff30..e3cfd620 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_9/data/cls_params/GridModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_9/data/cls_params/GridModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_9/data/cls_params/LoadModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_9/data/cls_params/LoadModule/time_series.csv.gz index 72b526fa..40f398c2 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_9/data/cls_params/LoadModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_9/data/cls_params/LoadModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_9/data/cls_params/RenewableModule/time_series.csv.gz b/src/pymgrid/data/scenario/pymgrid25/microgrid_9/data/cls_params/RenewableModule/time_series.csv.gz index a742473e..2e04642d 100644 Binary files a/src/pymgrid/data/scenario/pymgrid25/microgrid_9/data/cls_params/RenewableModule/time_series.csv.gz and b/src/pymgrid/data/scenario/pymgrid25/microgrid_9/data/cls_params/RenewableModule/time_series.csv.gz differ diff --git a/src/pymgrid/data/scenario/pymgrid25/microgrid_9/microgrid_9.yaml b/src/pymgrid/data/scenario/pymgrid25/microgrid_9/microgrid_9.yaml index e4a2cb17..29ebd67b 100644 --- a/src/pymgrid/data/scenario/pymgrid25/microgrid_9/microgrid_9.yaml +++ b/src/pymgrid/data/scenario/pymgrid25/microgrid_9/microgrid_9.yaml @@ -2,8 +2,8 @@ final_step: 8759 initial_step: 0 modules: -- - load - - !LoadModule +- - pv + - !RenewableModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -14,15 +14,16 @@ modules: normalized_action_bounds: - 0 - 1 + provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' name: - - load + - pv - 0 state: _current_step: 0 -- - pv - - !RenewableModule +- - load + - !LoadModule cls_params: final_step: 8759 forecast_horizon: 23 @@ -33,11 +34,25 @@ modules: normalized_action_bounds: - 0 - 1 - provided_energy_name: renewable_used raise_errors: false - time_series: !NDArray 'data/cls_params/RenewableModule/time_series.csv.gz' + time_series: !NDArray 'data/cls_params/LoadModule/time_series.csv.gz' name: - - pv + - load + - 0 + state: + _current_step: 0 +- - curtailment + - !CurtailmentModule + cls_params: + curtailment_cost: 0.0 + initial_step: 0 + modules_to_curtail: null + normalized_action_bounds: + - 0 + - 1 + raise_errors: false + name: + - curtailment - 0 state: _current_step: 0 diff --git a/src/pymgrid/envs/base/base.py b/src/pymgrid/envs/base/base.py index 9402a9a2..f0540042 100644 --- a/src/pymgrid/envs/base/base.py +++ b/src/pymgrid/envs/base/base.py @@ -91,6 +91,7 @@ def __new__(cls, modules, *args, **kwargs): def __init__(self, modules, + add_curtailment_module=True, add_unbalanced_module=True, loss_load_cost=10, overgeneration_cost=2, @@ -103,6 +104,7 @@ def __init__(self, ): super().__init__(modules, + add_curtailment_module=add_curtailment_module, add_unbalanced_module=add_unbalanced_module, loss_load_cost=loss_load_cost, overgeneration_cost=overgeneration_cost, @@ -347,6 +349,7 @@ def from_microgrid(cls, microgrid, **kwargs): kwargs = kwargs.copy() kwargs['add_unbalanced_module'] = kwargs.pop('add_unbalanced_module', False) + kwargs['add_curtailment_module'] = kwargs.pop('add_curtailment_module', False) kwargs['reward_shaping_func'] = kwargs.pop('reward_shaping_func', microgrid.reward_shaping_func) kwargs['trajectory_func'] = kwargs.pop('trajectory_func', microgrid.trajectory_func) diff --git a/src/pymgrid/envs/discrete/discrete.py b/src/pymgrid/envs/discrete/discrete.py index 007883d9..e10df597 100644 --- a/src/pymgrid/envs/discrete/discrete.py +++ b/src/pymgrid/envs/discrete/discrete.py @@ -37,6 +37,7 @@ class DiscreteMicrogridEnv(BaseMicrogridEnv, PriorityListAlgo): def __init__(self, modules, + add_curtailment_module=True, add_unbalanced_module=True, loss_load_cost=10, overgeneration_cost=2, @@ -49,6 +50,7 @@ def __init__(self, reset_callback=None ): super().__init__(modules, + add_curtailment_module=add_curtailment_module, add_unbalanced_module=add_unbalanced_module, loss_load_cost=loss_load_cost, overgeneration_cost=overgeneration_cost, diff --git a/src/pymgrid/microgrid/microgrid.py b/src/pymgrid/microgrid/microgrid.py index 0c210b46..976b1f24 100644 --- a/src/pymgrid/microgrid/microgrid.py +++ b/src/pymgrid/microgrid/microgrid.py @@ -33,7 +33,7 @@ class Microgrid(yaml.YAMLObject): .. note:: The constructor copies modules passed to it. - add_curtailment_module : bool, default False + add_curtailment_module : bool, default True add_unbalanced_module : bool, default True Whether to add an unbalanced energy module to your microgrid. Such a module computes and attributes @@ -103,7 +103,7 @@ class Microgrid(yaml.YAMLObject): def __init__(self, modules, - add_curtailment_module=False, + add_curtailment_module=True, add_unbalanced_module=True, curtailment_cost=0.0, loss_load_cost=10., @@ -118,6 +118,8 @@ def __init__(self, loss_load_cost, overgeneration_cost) + self._setup_curtailment() + # TODO (ahalev) transform envs to wrappers, and remove microgrid from attr names) self.microgrid_action_space = MicrogridSpace.from_module_spaces( self._modules.get_attrs('action_space', 'module_type', as_pandas=False), 'act') @@ -181,20 +183,12 @@ def _get_module_container(self, raise TypeError("modules must be list-like of modules.") if add_curtailment_module: - curtailment_module = CurtailmentModule(curtailment_cost=curtailment_cost) - modules.append(curtailment_module) - else: - curtailment_module = None + modules.append(CurtailmentModule(curtailment_cost=curtailment_cost)) if add_unbalanced_module: modules.append(self._get_unbalanced_energy_module(loss_load_cost, overgeneration_cost)) - container = ModuleContainer(modules) - - if curtailment_module: - curtailment_module.setup(container) - - return container + return ModuleContainer(modules) def _check_trajectory_func(self, trajectory_func): if trajectory_func is None: @@ -226,6 +220,11 @@ def _check_trajectory_func(self, trajectory_func): return trajectory_func + def _setup_curtailment(self): + for module in self._modules.iterlist(): + if isinstance(module, CurtailmentModule): + module.setup(self._modules) + def reset(self): """ Reset the microgrid and flush the log. @@ -236,13 +235,12 @@ def reset(self): Observations from resetting the modules as well as the flushed balance log. """ self._set_trajectory() - def reset_args(module): return (self.modules,) if isinstance(module, CurtailmentModule) else () + self._setup_curtailment() return { - **{name: [module.reset(*reset_args(module)) for module in module_list] - for name, module_list in self.modules.iterdict()}, - **{"balance": self._balance_logger.flush(), - "other": self._microgrid_logger.flush()} + **{name: [module.reset() for module in module_list] for name, module_list in self.modules.iterdict()}, + "balance": self._balance_logger.flush(), + "other": self._microgrid_logger.flush() } def _set_trajectory(self): @@ -961,7 +959,7 @@ def from_yaml(cls, loader, node): warn(f'Ignoring keys {mapping.keys()} when loading from scenario.') return cls.from_scenario(microgrid_number) - instance = cls(mapping["modules"], add_unbalanced_module=False) + instance = cls(mapping["modules"], add_curtailment_module=False, add_unbalanced_module=False) instance.deserialize(mapping) return instance diff --git a/src/pymgrid/modules/curtailment_module.py b/src/pymgrid/modules/curtailment_module.py index d77a19b6..0d1e3d3c 100644 --- a/src/pymgrid/modules/curtailment_module.py +++ b/src/pymgrid/modules/curtailment_module.py @@ -141,6 +141,9 @@ def _update_max_consumption(self): assert self._current_step == self._curtailment_modules.get_attrs('final_step', unique=True).item() - 1 self._next_max_consumption = 0.0 return True + except ValueError: + assert len(self._curtailment_modules) == 0 + self._next_max_consumption = 0.0 def _state_dict(self): return dict() @@ -168,6 +171,9 @@ def max_act(self): @property def max_consumption(self): + if self._curtailment_modules is None: + raise RuntimeError('Must call RenewableCurtailmentModule.setup before usage!') + module_current_step = self._curtailment_modules.get_attrs('current_step', unique=True).item() if not self._current_step == module_current_step - 1: raise RuntimeError(f'self.current_step={self._current_step} is not one less than curtailment module current' @@ -184,6 +190,14 @@ def is_sink(self): def absorption_marginal_cost(self): return self.curtailment_cost + @property + def modules_to_curtail(self): + return self._modules_to_curtail + + @property + def curtailment_modules(self): + return self._curtailment_modules + def __repr__(self): return f'CurtailmentModule(' \ f'modules={self._curtailment_modules.get_attrs("name").squeeze(axis=0).values.tolist()})' diff --git a/src/pymgrid/modules/module_container.py b/src/pymgrid/modules/module_container.py index 478c01f9..9656d4a0 100644 --- a/src/pymgrid/modules/module_container.py +++ b/src/pymgrid/modules/module_container.py @@ -461,7 +461,7 @@ def get_subcontainers(modules, set_names=True): if set_names: name = (module_name, len(d[source_sink_both][module_name]) - 1) - if not all(x is None for x in module.name): + if not name == module.name or not all(x is None for x in module.name): warnings.warn(f"Overwriting module name '{module.name}' with name '{name}'.") module.name = name diff --git a/tests/envs/test_discrete.py b/tests/envs/test_discrete.py index c43796d0..b33e06bc 100644 --- a/tests/envs/test_discrete.py +++ b/tests/envs/test_discrete.py @@ -22,7 +22,9 @@ def test_init_from_microgrid(self): def test_init_from_modules(self): microgrid = get_modular_microgrid() - env = DiscreteMicrogridEnv(microgrid.modules.to_tuples(), add_unbalanced_module=False) + env = DiscreteMicrogridEnv(microgrid.modules.to_tuples(), + add_curtailment_module=False, + add_unbalanced_module=False) self.assertEqual(env.modules, microgrid.modules) self.assertIsNot(env.modules.to_tuples(), microgrid.modules.to_tuples()) diff --git a/tests/microgrid/serialize/test_microgrid_serialization.py b/tests/microgrid/serialize/test_microgrid_serialization.py index 52636ef9..5ded5bcc 100644 --- a/tests/microgrid/serialize/test_microgrid_serialization.py +++ b/tests/microgrid/serialize/test_microgrid_serialization.py @@ -8,7 +8,7 @@ class TestMicrogridSerialization(TestCase): def test_serialize_no_modules(self): - microgrid = Microgrid([], add_unbalanced_module=False) + microgrid = Microgrid([], add_curtailment_module=False, add_unbalanced_module=False) dump = microgrid.dump() loaded = Microgrid.load(dump)