From 8dba48c4125a5578a65f4cf96c94f33780fb36ca Mon Sep 17 00:00:00 2001
From: martacki <martha.frysztacki@kit.edu>
Date: Tue, 21 Jun 2022 19:08:22 +0200
Subject: [PATCH] clustering strats to configurables: documentation and testing

---
 doc/configtables/clustering.csv | 5 +++++
 doc/release_notes.rst           | 1 +
 test/config.test1.yaml          | 9 +++++++++
 3 files changed, 15 insertions(+)

diff --git a/doc/configtables/clustering.csv b/doc/configtables/clustering.csv
index 2f63f955..f178ff5c 100644
--- a/doc/configtables/clustering.csv
+++ b/doc/configtables/clustering.csv
@@ -1,3 +1,8 @@
 ,Unit,Values,Description
 simplify,,,
 -- to_substations,bool,"{'true','false'}","Aggregates all nodes without power injection (positive or negative, i.e. demand or generation) to electrically closest ones"
+-- aggregation_strategies,,,
+-- -- generators,,,
+-- -- -- {key},str,"{key} can be any of the component of the generator (str). It’s value can be any that can be converted to pandas.Series using getattr(). For example one of {min, max, sum}.","Aggregates the component according to the given strategy. For example, if sum, then all values within each cluster are summed to represent the new generator."
+-- -- buses,,,
+-- -- -- {key},str,"{key} can be any of the component of the bus (str). It’s value can be any that can be converted to pandas.Series using getattr(). For example one of {min, max, sum}.","Aggregates the component according to the given strategy. For example, if sum, then all values within each cluster are summed to represent the new bus."
diff --git a/doc/release_notes.rst b/doc/release_notes.rst
index 963a1175..c000a046 100644
--- a/doc/release_notes.rst
+++ b/doc/release_notes.rst
@@ -74,6 +74,7 @@ Upcoming Release
 
 * Update rasterio version to correctly calculate exclusion raster
 
+* Clustering strategies for generators and buses have moved from distinct scripts to configurables to unify the process and make it more transparent.
 
 PyPSA-Eur 0.4.0 (22th September 2021)
 =====================================
diff --git a/test/config.test1.yaml b/test/config.test1.yaml
index a9ce1e50..e3f39ab5 100755
--- a/test/config.test1.yaml
+++ b/test/config.test1.yaml
@@ -21,6 +21,15 @@ countries: ['BE']
 clustering:
   simplify:
     to_substations: false # network is simplified to nodes with positive or negative power injection (i.e. substations or offwind connections)
+  aggregation_strategies:
+    generators:
+      p_nom_max: sum # use "min" for more conservative assumptions
+      p_nom_min: sum
+      p_min_pu: mean
+      marginal_cost: mean
+      committable: any
+      ramp_limit_up: max
+      ramp_limit_down: max
 
 snapshots:
   start: "2013-03-01"