Merge branch 'master' into share-resources
This commit is contained in:
commit
a725844be9
@ -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)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user