Merge branch 'master' into share-resources

This commit is contained in:
Fabian Hofmann 2024-03-25 16:08:31 +01:00 committed by GitHub
commit a725844be9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -231,7 +231,7 @@ def distribute_clusters(n, n_clusters, focus_weights=None, solver_name="scip"):
.pipe(normed) .pipe(normed)
) )
N = n.buses.groupby(["country", "sub_network"]).size() N = n.buses.groupby(["country", "sub_network"]).size()[L.index]
assert ( assert (
n_clusters >= len(N) and n_clusters <= N.sum() n_clusters >= len(N) and n_clusters <= N.sum()
@ -454,7 +454,7 @@ if __name__ == "__main__":
if "snakemake" not in globals(): if "snakemake" not in globals():
from _helpers import mock_snakemake from _helpers import mock_snakemake
snakemake = mock_snakemake("cluster_network", simpl="", clusters="5") snakemake = mock_snakemake("cluster_network", simpl="", clusters="40")
configure_logging(snakemake) configure_logging(snakemake)
set_scenario_config(snakemake) set_scenario_config(snakemake)