From f1dedd9429fe6a5633fdfeead552abfacea48e39 Mon Sep 17 00:00:00 2001
From: martacki <martha.frysztacki@kit.edu>
Date: Mon, 27 Jun 2022 21:11:49 +0200
Subject: [PATCH] hierarchical clustering: release notes & revert to old
 default clustering algorithm (kmeans)

---
 config.default.yaml    | 8 ++++----
 config.tutorial.yaml   | 8 ++++----
 doc/release_notes.rst  | 2 ++
 test/config.test1.yaml | 8 ++++----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/config.default.yaml b/config.default.yaml
index e699c38f..e1ac6237 100755
--- a/config.default.yaml
+++ b/config.default.yaml
@@ -22,11 +22,11 @@ countries: ['AL', 'AT', 'BA', 'BE', 'BG', 'CH', 'CZ', 'DE', 'DK', 'EE', 'ES', 'F
 clustering:
   simplify_network:
     to_substations: false # network is simplified to nodes with positive or negative power injection (i.e. substations or offwind connections)
-    algorithm: hac
-    feature: solar+onwind-time
-  cluster_network:
-    algorithm: hac # choose from: [hac, kmeans]
+    algorithm: kmeans # choose from: [hac, kmeans]
     feature: solar+onwind-time # only for hac. choose from: [solar+onwind-time, solar+onwind-cap, solar-time, solar-cap, solar+offwind-cap] etc.
+  cluster_network:
+    algorithm: kmeans
+    feature: solar+onwind-time
   aggregation_strategies:
     generators:
       p_nom_max: sum # use "min" for more conservative assumptions
diff --git a/config.tutorial.yaml b/config.tutorial.yaml
index 75703b8a..db20f1a4 100755
--- a/config.tutorial.yaml
+++ b/config.tutorial.yaml
@@ -22,11 +22,11 @@ countries: ['BE']
 clustering:
   simplify_network:
     to_substations: false # network is simplified to nodes with positive or negative power injection (i.e. substations or offwind connections)
-    algorithm: hac
-    feature: solar+onwind-time
-  cluster_network:
-    algorithm: hac # choose from: [hac, kmeans]
+    algorithm: kmeans # choose from: [hac, kmeans]
     feature: solar+onwind-time # only for hac. choose from: [solar+onwind-time, solar+onwind-cap, solar-time, solar-cap, solar+offwind-cap] etc.
+  cluster_network:
+    algorithm: kmeans
+    feature: solar+onwind-time
   aggregation_strategies:
     generators:
       p_nom_max: sum # use "min" for more conservative assumptions
diff --git a/doc/release_notes.rst b/doc/release_notes.rst
index c000a046..47a67970 100644
--- a/doc/release_notes.rst
+++ b/doc/release_notes.rst
@@ -76,6 +76,8 @@ Upcoming Release
 
 * Clustering strategies for generators and buses have moved from distinct scripts to configurables to unify the process and make it more transparent.
 
+* Hierarchical clustering was introduced. Distance metric is calculated from renewable potentials on hourly (feature entry ends with `-time`) or annual (feature entry in config end with `-cap`) values.
+
 PyPSA-Eur 0.4.0 (22th September 2021)
 =====================================
 
diff --git a/test/config.test1.yaml b/test/config.test1.yaml
index d8d095b8..5aecfdf2 100755
--- a/test/config.test1.yaml
+++ b/test/config.test1.yaml
@@ -21,11 +21,11 @@ countries: ['BE']
 clustering:
   simplify_network:
     to_substations: false # network is simplified to nodes with positive or negative power injection (i.e. substations or offwind connections)
-    algorithm: hac
-    feature: solar+onwind-time
-  cluster_network:
-    algorithm: hac # choose from: [hac, kmeans]
+    algorithm: kmeans # choose from: [hac, kmeans]
     feature: solar+onwind-time # only for hac. choose from: [solar+onwind-time, solar+onwind-cap, solar-time, solar-cap, solar+offwind-cap] etc.
+  cluster_network:
+    algorithm: kmeans
+    feature: solar+onwind-time
   aggregation_strategies:
     generators:
       p_nom_max: sum # use "min" for more conservative assumptions