shapefiles for bidding zones implemented and names for shape-files sy…

…nchronized with bidding zone review
openego · Feb 24, 2025 · f90e2b7 · f90e2b7
1 parent c0c6b84
commit f90e2b7
Show file tree

Hide file tree

Showing 193 changed files with 50,419 additions and 49,536 deletions.
diff --git a/etrago/appl.py b/etrago/appl.py
@@ -58,7 +58,7 @@
         "market_optimization":
             {
                 "active": True,
-                "market_zones": "3_zones", # only used if type='market_grid'
+                "market_zones": "DE4", # only used if type='market_grid'; "status_quo", "DE2", "DE3", "DE4" or "DE5"
                 "rolling_horizon": {# Define parameter of market optimization
                     "planning_horizon": 168, # number of snapshots in each optimization
                     "overlap": 120, # number of overlapping hours

diff --git a/etrago/execute/market_optimization.py b/etrago/execute/market_optimization.py
@@ -259,13 +259,16 @@ def build_market_model(self):
 
     """
 
+    import geopandas as gpd
+    import requests
+    import os
+    from shapely.geometry import Point
 
     # use existing preprocessing to get only the electricity system
     net, weight, n_clusters, busmap_foreign = preprocessing(
         self, apply_on="market_model"
     )
 
-    import pdb; pdb.set_trace()
     # Define market regions based on settings.
     # Currently the only option is 'status_quo' which means that the current
     # regions are used. When other market zone options are introduced, they
@@ -371,7 +374,7 @@ def assign_zone(row):
 
     elif (
         self.args["method"]["market_optimization"]["market_zones"]
-        == "3_zones"
+        == "DE3"
     ):
 
 

diff --git a/etrago/kmedoids-dijkstra_elecgrid_busmap_30_result.csv b/etrago/kmedoids-dijkstra_elecgrid_busmap_30_result.csv
@@ -1,15 +1,15 @@
 bus,cluster,foreign,medoid_idx
 0,12,,
-1,13,,
-10,12,,
+1,11,,
+10,11,,
 11,12,,
-12,11,,
+12,13,,
 13,12,,
-14,13,,
-15,11,,
-2,11,,
-3,13,,
-4,11,,
+14,11,,
+15,14,,
+2,13,,
+3,11,,
+4,14,,
 43775,0,43775,
 43776,1,43776,
 43777,2,43777,
@@ -19,13 +19,13 @@ bus,cluster,foreign,medoid_idx
 43781,5,43781,
 43782,6,43782,
 43783,6,43783,
-43784,11,43784,
+43784,13,43784,
 43785,7,43785,
 43786,8,43786,
 43787,9,43787,
 43788,10,43788,
-5,13,,
-6,12,,
-7,11,,
-8,11,,
-9,11,,
+5,11,,
+6,11,,
+7,13,,
+8,14,,
+9,13,,
diff --git a/etrago/results/args.json b/etrago/results/args.json
@@ -7,7 +7,7 @@
         "formulation": "linopy",
         "market_optimization": {
             "active": true,
-            "market_zones": "3_zones",
+            "market_zones": "DE4",
             "rolling_horizon": {
                 "planning_horizon": 168,
                 "overlap": 120

diff --git a/etrago/results/buses-marginal_price.csv b/etrago/results/buses-marginal_price.csv
diff --git a/etrago/results/buses-p.csv b/etrago/results/buses-p.csv
diff --git a/etrago/results/buses-v_ang.csv b/etrago/results/buses-v_ang.csv
diff --git a/etrago/results/clustering/lines.csv b/etrago/results/clustering/lines.csv
diff --git a/etrago/results/generators-marginal_cost.csv b/etrago/results/generators-marginal_cost.csv
diff --git a/etrago/results/generators-p.csv b/etrago/results/generators-p.csv
diff --git a/etrago/results/generators-p_max_pu.csv b/etrago/results/generators-p_max_pu.csv
diff --git a/etrago/results/generators-p_min_pu.csv b/etrago/results/generators-p_min_pu.csv
diff --git a/etrago/results/lines-p0.csv b/etrago/results/lines-p0.csv
diff --git a/etrago/results/lines-p1.csv b/etrago/results/lines-p1.csv
diff --git a/etrago/results/lines.csv b/etrago/results/lines.csv
diff --git a/etrago/results/links-marginal_cost.csv b/etrago/results/links-marginal_cost.csv
diff --git a/etrago/results/links-p0.csv b/etrago/results/links-p0.csv
diff --git a/etrago/results/links-p1.csv b/etrago/results/links-p1.csv
diff --git a/etrago/results/links-p_max_pu.csv b/etrago/results/links-p_max_pu.csv
diff --git a/etrago/results/links-p_min_pu.csv b/etrago/results/links-p_min_pu.csv
@@ -1,21 +1,21 @@
 ,117,119,120,121,122,124,125,127,128,130,131,132,133,134,135,136,137,138,140,141,143,144,188,189,191,192,194,195,197,198,72,83,86,97,98,102,115,118,123,126,139,142,190,193,196
-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,0.8904260457177523,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.8904280471916451,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.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.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
 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,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.19999999998678122,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 3,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,1.0000000000002642,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 4,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.19999999998678122,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.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.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0000000000002642,0.3009341619036346,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.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.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.34163681326806383,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 6,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.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 7,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.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-8,0.0,0.0,0.0,1.0000000000005353,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.0000000000017109,0.0,1.0000000000006213,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.9944375271892562,0.0,0.0,0.0,0.0,0.0,0.0,1.0000000000002642,0.2000000000000547,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-9,0.0,0.9999999999993378,0.0,1.0000000000005353,0.0,0.0,0.0,0.5104294033479876,0.0,0.0,0.0,0.0,1.0000000000014402,0.0,1.0000000000003575,0.0,1.0000000000017109,0.0,1.0000000000006213,0.0,0.0,0.0,0.9999999999958211,0.0,0.0,0.0,1.0000000000006026,0.0,0.0,0.0,0.0,0.0,0.0,0.19999999998678122,0.5580451851408368,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-10,0.0,0.0,0.0,1.0000000000005353,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.0000000000017109,0.0,1.0000000000006213,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.3046916961922384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.44804089318419316,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-11,1.000000000000475,0.9999999999993378,0.9999999999998285,1.0000000000005353,1.0000000000021958,0.9999999999990267,0.9999999999987538,0.999999999999877,1.0000000000016374,0.9999999999990913,1.000000000001677,0.9999999999990897,1.0000000000014402,1.0000000000002922,1.0000000000003575,0.9999999999993628,1.0000000000017109,0.9999999999997504,1.0000000000006213,0.9999999999998388,0.8971660122904964,1.00000000000036,0.9999999999958211,1.0000000000035563,0.0,0.9999999999993574,1.0000000000006026,1.0000000000002998,1.0000000000003157,0.9999999999994272,1.0000000000001588,1.0000000000001628,0.9999999999985183,0.0,0.3099934605852844,0.20000000000010756,0.9999999999999998,1.0,1.0,1.0,1.0,0.9999999999999999,0.9999999999999999,1.0,0.9999999999999998
-12,1.0000000000004754,0.9999999999993378,0.9999999999998285,1.0000000000005353,1.0000000000021958,0.9999999999990267,0.9999999999987538,0.999999999999877,1.0000000000016374,0.9999999999990913,1.000000000001677,0.9999999999990897,1.0000000000014402,1.000000000000293,1.0000000000003575,0.9999999999993628,1.0000000000017109,0.9999999999997504,1.0000000000006213,0.9999999999998388,0.9999999999988192,1.00000000000036,0.9999999999958211,1.0000000000035563,0.10731008546258332,0.9999999999993574,1.0000000000006026,1.0000000000002998,1.0000000000003157,0.9999999999994272,1.0000000000001588,1.0000000000001628,0.9999999999985183,0.0,0.38439914327702673,0.0,0.9999999999999998,1.0,1.0,1.0,1.0,0.9999999999999999,0.9999999999999999,1.0,0.9999999999999998
-13,1.0000000000004754,0.9999999999993378,0.9999999999998286,1.0000000000005353,1.0000000000021958,0.9999999999990267,0.9999999999987538,0.999999999999877,1.0000000000016374,0.9999999999990913,1.000000000001677,0.9999999999990897,1.0000000000014402,1.0000000000002924,1.0000000000003575,0.9999999999993628,1.0000000000017109,0.9999999999997504,1.0000000000006213,0.9999999999998388,0.9296907838787024,1.00000000000036,0.9999999999958211,1.0000000000035563,0.0,0.9999999999993574,1.0000000000006026,1.0000000000002998,1.0000000000003157,0.9999999999994272,1.0000000000001588,1.0000000000001628,0.9999999999985183,0.0,0.6211249880869859,0.8291261151387933,0.9999999999999998,1.0,1.0,1.0,1.0,0.9999999999999999,0.9999999999999999,1.0,0.9999999999999998
-14,1.0000000000004754,0.9999999999993378,0.9999999999998285,1.0000000000005353,1.0000000000021958,0.9999999999990267,0.9999999999987538,0.999999999999877,1.0000000000016374,0.9999999999990913,1.000000000001677,0.9999999999990897,1.0000000000014402,1.0000000000002924,1.0000000000003575,0.9999999999993628,1.0000000000017109,0.9999999999997504,1.0000000000006213,0.9999999999998388,0.9999999999988192,1.00000000000036,0.9999999999958211,1.0000000000035594,0.02065753162009034,0.9999999999993574,1.0000000000006026,1.0000000000002998,1.0000000000003157,0.9999999999994272,1.0000000000001588,1.0000000000001628,0.9999999999985183,0.0,0.6312456908122667,0.3586363209549017,0.9999999999999998,1.0,1.0,1.0,1.0,0.9999999999999999,0.9999999999999999,1.0,0.9999999999999998
-15,0.0,0.0,0.0,1.0000000000005353,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.0000000000017109,0.0,1.0000000000006213,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.4902386200921796,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
-16,0.0,0.9999999999993378,0.0,1.0000000000005353,0.0,0.0,0.0,0.005597639923279789,0.0,0.0,0.0,0.0,1.0000000000014402,0.0,1.0000000000003575,0.0,1.0000000000017109,0.0,1.0000000000006213,0.0,0.0,0.0,0.9999999999958211,0.0,0.0,0.0,1.0000000000006026,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
+8,0.0,0.9999999999993378,0.0,1.0000000000005353,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.9978154136438319,0.0,0.0,0.0,1.0000000000017109,0.0,1.0000000000006213,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0000000000006026,0.0,0.0,0.0,0.0,0.0,0.0,1.0000000000002642,0.20000000000005527,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+9,0.0,0.9999999999993378,0.0,1.0000000000005353,0.0,0.0,0.0,0.5158673408702276,0.0,0.0,0.0,0.0,1.0000000000014402,0.0,1.0000000000003575,0.0,1.0000000000017109,0.0,1.0000000000006213,0.0,0.0,0.0,0.9999999999958211,0.0,0.0,0.0,1.0000000000006026,0.0,0.0,0.0,0.0,0.0,0.0,1.0000000000002642,0.5254832106865294,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+10,0.0,0.0,0.0,1.0000000000005353,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.0000000000017109,0.0,1.0000000000006213,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.30469169619223807,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.44804097464932413,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+11,1.0000000000004754,0.9999999999993378,0.9999999999998285,1.0000000000005353,1.0000000000021958,0.9999999999990267,0.999999999998754,0.999999999999877,1.0000000000016376,0.9999999999990913,1.000000000001677,0.9999999999990897,1.0000000000014402,1.0000000000002924,1.0000000000003575,0.9999999999993637,1.0000000000017109,0.9999999999997484,1.0000000000006213,0.9999999999998388,0.8971660122904964,1.00000000000036,0.9999999999958211,1.0000000000035563,0.0,0.9999999999993574,1.0000000000006026,1.0000000000002998,1.0000000000003157,0.9999999999994272,1.0000000000001588,1.0000000000001628,0.9999999999985183,0.0,0.3099935725555523,0.20000000000010756,0.9999999999999998,1.0,1.0,1.0,1.0,0.9999999999999999,0.9999999999999999,1.0,0.9999999999999998
+12,1.0000000000004754,0.9999999999993378,0.9999999999998285,1.0000000000005353,1.0000000000021958,0.9999999999990267,0.999999999998754,0.999999999999877,1.0000000000016374,0.9999999999990913,1.000000000001677,0.9999999999990897,1.0000000000014402,1.0000000000002924,1.0000000000003575,0.9999999999993628,1.0000000000017109,0.9999999999997504,1.0000000000006213,0.9999999999998388,0.9999999999988202,1.0000000000003593,0.9999999999958211,1.0000000000035563,0.10731008546258138,0.9999999999993574,1.0000000000006026,1.0000000000002998,1.0000000000003157,0.9999999999994272,1.0000000000001588,1.0000000000001628,0.9999999999985183,0.0,0.38506308117991117,0.0,0.9999999999999998,1.0,1.0,1.0,1.0,0.9999999999999999,0.9999999999999999,1.0,0.9999999999999998
+13,1.0000000000004754,0.9999999999993378,0.9999999999998285,1.0000000000005353,1.0000000000021958,0.9999999999990267,0.999999999998754,0.999999999999877,1.0000000000016374,0.9999999999990913,1.000000000001677,0.9999999999990886,1.0000000000014402,1.0000000000002924,1.0000000000003575,0.9999999999993625,1.0000000000017109,0.9999999999997504,1.0000000000006213,0.9999999999998388,0.9296907838787021,1.00000000000036,0.9999999999958211,1.0000000000035563,0.0,0.9999999999993574,1.0000000000006026,1.0000000000003002,1.0000000000003157,0.9999999999994272,1.0000000000001588,1.0000000000001628,0.9999999999985183,0.0,0.6211251000572539,0.20000000000010756,0.9999999999999998,1.0,1.0,1.0,1.0,0.9999999999999999,0.9999999999999999,1.0,0.9999999999999998
+14,1.0000000000004754,0.9999999999993378,0.9999999999998285,1.0000000000005353,1.0000000000021958,0.9999999999990267,0.999999999998754,0.999999999999877,1.0000000000016374,0.9999999999990913,1.000000000001677,0.9999999999990897,1.0000000000014402,1.0000000000002924,1.0000000000003575,0.9999999999993628,1.0000000000017109,0.9999999999997504,1.0000000000006213,0.9999999999998388,0.9999999999988202,1.00000000000036,0.9999999999958211,1.0000000000035507,0.020657531620088595,0.9999999999993574,1.0000000000006026,1.0000000000003002,1.0000000000003157,0.9999999999994272,1.0000000000001588,1.0000000000001628,0.9999999999985183,0.0,0.6312458027825346,0.4446470199950284,0.9999999999999998,1.0,1.0,1.0,1.0,0.9999999999999999,0.9999999999999999,1.0,0.9999999999999998
+15,0.0,0.0,0.0,1.0000000000005353,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.0000000000017109,0.0,1.0000000000006213,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.4902386200921793,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
+16,0.0,0.9999999999993378,0.0,1.0000000000005353,0.0,0.0,0.0,0.05266903358788099,0.0,0.0,0.0,0.0,1.0000000000014402,0.0,1.0000000000003575,0.0,1.0000000000017109,0.0,1.0000000000006213,0.0,0.0,0.0,0.9999999999958211,0.0,0.0,0.0,1.0000000000006026,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
 17,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.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 18,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.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 19,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.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
@@ -27,8 +27,8 @@
 25,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.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 26,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.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 27,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.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-28,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.0,0.32270369581563557,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-29,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.0,0.22476960940289284,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+28,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.0,0.27348352357231975,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+29,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.0,0.23736626327539384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 30,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.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 31,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.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 32,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.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0