diff --git a/etrago/args.json b/etrago/args.json index 1ebcf89a..8693f929 100644 --- a/etrago/args.json +++ b/etrago/args.json @@ -57,7 +57,8 @@ "method": "kmedoids-dijkstra", "n_clusters_AC": 30, "cluster_foreign_AC": false, - "n_clusters_gas": 30, + "method_gas": "kmedoids-dijkstra", + "n_clusters_gas": 17, "cluster_foreign_gas": false, "k_elec_busmap": false, "k_gas_busmap": false, @@ -68,10 +69,11 @@ "line_length_factor": 1, "remove_stubs": false, "use_reduced_coordinates": false, - "random_state":42, + "random_state": 42, "n_init": 10, "max_iter": 100, - "tol": 1e-06 + "tol": 1e-6, + "CPU_cores": 4, }, "sector_coupled_clustering": { "active": true, @@ -88,10 +90,11 @@ "snapshot_clustering": { "active": false, "method": "segmentation", + "extreme_periods": null, "how": "daily", "storage_constraints": "soc_constraints", "n_clusters": 5, - "n_segments": 5 + "n_segments": 5, }, "skip_snapshots": 5, "temporal_disaggregation": { diff --git a/setup.py b/setup.py index 5491991a..7cfa7ab3 100755 --- a/setup.py +++ b/setup.py @@ -65,6 +65,7 @@ def read(*names, **kwargs): "setuptools >= 54.2.0", "shapely", "sqlalchemy < 2", + "tables < 3.9", "tilemapbase == 0.4.5", "tsam", ],