bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

scripts: remove deprecated clustering methods, remove unused imports

Browse Source
This commit is contained in:
Fabian Neumann 2022-07-27 09:02:34 +02:00
parent 87388d4b4a
commit cdd063d3b0
5 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/_helpers.py
View File

@ -4,7 +4,6 @@
import pandas as pd import pandas as pd
from pathlib import Path from pathlib import Path
from collections import OrderedDict
REGION_COLS = ['geometry', 'name', 'x', 'y', 'country'] REGION_COLS = ['geometry', 'name', 'x', 'y', 'country']

2
scripts/build_powerplants.py
View File

@ -77,10 +77,8 @@ from _helpers import configure_logging
import pypsa import pypsa
import powerplantmatching as pm import powerplantmatching as pm
import pandas as pd import pandas as pd
import numpy as np
from powerplantmatching.export import map_country_bus from powerplantmatching.export import map_country_bus
from scipy.spatial import cKDTree as KDTree
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

1
scripts/build_shapes.py
View File

@ -70,7 +70,6 @@ Description
import logging import logging
from _helpers import configure_logging from _helpers import configure_logging
import os
import numpy as np import numpy as np
from operator import attrgetter from operator import attrgetter
from functools import reduce from functools import reduce

17
scripts/cluster_network.py
View File

@ -125,8 +125,6 @@ import logging
from _helpers import configure_logging, update_p_nom_max, get_aggregation_strategies from _helpers import configure_logging, update_p_nom_max, get_aggregation_strategies
import pypsa import pypsa
import os
import shapely
import pandas as pd import pandas as pd
import numpy as np import numpy as np
@ -137,8 +135,7 @@ import seaborn as sns
from functools import reduce from functools import reduce
from pypsa.networkclustering import (busmap_by_kmeans, busmap_by_spectral_clustering, from pypsa.networkclustering import (busmap_by_kmeans, busmap_by_hac, get_clustering_from_busmap)
busmap_by_hac, _make_consense, get_clustering_from_busmap)
import warnings import warnings
warnings.filterwarnings(action='ignore', category=UserWarning) warnings.filterwarnings(action='ignore', category=UserWarning)
@ -305,12 +302,6 @@ def busmap_for_n_clusters(n, n_clusters, solver_name, focus_weights=None, algori
n_clusters = distribute_clusters(n, n_clusters, focus_weights=focus_weights, solver_name=solver_name) n_clusters = distribute_clusters(n, n_clusters, focus_weights=focus_weights, solver_name=solver_name)
def reduce_network(n, buses):
nr = pypsa.Network()
nr.import_components_from_dataframe(buses, "Bus")
nr.import_components_from_dataframe(n.lines.loc[n.lines.bus0.isin(buses.index) & n.lines.bus1.isin(buses.index)], "Line")
return nr
def busmap_for_country(x): def busmap_for_country(x):
prefix = x.name[0] + x.name[1] + ' ' prefix = x.name[0] + x.name[1] + ' '
logger.debug(f"Determining busmap for country {prefix[:-1]}") logger.debug(f"Determining busmap for country {prefix[:-1]}")
@ -320,14 +311,10 @@ def busmap_for_n_clusters(n, n_clusters, solver_name, focus_weights=None, algori
if algorithm == "kmeans": if algorithm == "kmeans":
return prefix + busmap_by_kmeans(n, weight, n_clusters[x.name], buses_i=x.index, **algorithm_kwds) return prefix + busmap_by_kmeans(n, weight, n_clusters[x.name], buses_i=x.index, **algorithm_kwds)
elif algorithm == "spectral":
return prefix + busmap_by_spectral_clustering(reduce_network(n, x), n_clusters[x.name], **algorithm_kwds)
elif algorithm == "louvain":
return prefix + busmap_by_louvain(reduce_network(n, x), n_clusters[x.name], **algorithm_kwds)
elif algorithm == "hac": elif algorithm == "hac":
return prefix + busmap_by_hac(n, n_clusters[x.name], buses_i=x.index, feature=feature.loc[x.index]) return prefix + busmap_by_hac(n, n_clusters[x.name], buses_i=x.index, feature=feature.loc[x.index])
else: else:
raise ValueError(f"`algorithm` must be one of 'kmeans', 'hac', 'spectral' or 'louvain'. Is {algorithm}.") raise ValueError(f"`algorithm` must be one of 'kmeans' or 'hac'. Is {algorithm}.")
return (n.buses.groupby(['country', 'sub_network'], group_keys=False) return (n.buses.groupby(['country', 'sub_network'], group_keys=False)
.apply(busmap_for_country).squeeze().rename('busmap')) .apply(busmap_for_country).squeeze().rename('busmap'))

2
scripts/simplify_network.py
View File

@ -99,7 +99,7 @@ from functools import reduce
import pypsa import pypsa
from pypsa.io import import_components_from_dataframe, import_series_from_dataframe from pypsa.io import import_components_from_dataframe, import_series_from_dataframe
from pypsa.networkclustering import busmap_by_stubs, aggregategenerators, aggregateoneport, get_clustering_from_busmap, _make_consense from pypsa.networkclustering import busmap_by_stubs, aggregategenerators, aggregateoneport, get_clustering_from_busmap
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)