scripts: mini code cleanup (#140)
This commit is contained in:
parent
2f85b0ede5
commit
d57989c027
@ -94,8 +94,6 @@ def load_network_for_plots(fn, tech_costs, config, combine_hydro_ps=True):
|
|||||||
import pypsa
|
import pypsa
|
||||||
from add_electricity import update_transmission_costs, load_costs
|
from add_electricity import update_transmission_costs, load_costs
|
||||||
|
|
||||||
opts = config['plotting']
|
|
||||||
|
|
||||||
n = pypsa.Network(fn)
|
n = pypsa.Network(fn)
|
||||||
|
|
||||||
n.loads["carrier"] = n.loads.bus.map(n.buses.carrier) + " load"
|
n.loads["carrier"] = n.loads.bus.map(n.buses.carrier) + " load"
|
||||||
|
@ -66,7 +66,7 @@ import yaml
|
|||||||
import pandas as pd
|
import pandas as pd
|
||||||
import geopandas as gpd
|
import geopandas as gpd
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import scipy as sp, scipy.spatial
|
import scipy as sp
|
||||||
from scipy.sparse import csgraph
|
from scipy.sparse import csgraph
|
||||||
from six import iteritems
|
from six import iteritems
|
||||||
from itertools import product
|
from itertools import product
|
||||||
|
@ -227,7 +227,7 @@ def busmap_for_n_clusters(n, n_clusters, solver_name, focus_weights=None, algori
|
|||||||
elif algorithm == "louvain":
|
elif algorithm == "louvain":
|
||||||
return prefix + busmap_by_louvain(reduce_network(n, x), n_clusters[x.name], **algorithm_kwds)
|
return prefix + busmap_by_louvain(reduce_network(n, x), n_clusters[x.name], **algorithm_kwds)
|
||||||
else:
|
else:
|
||||||
raise ArgumentError("`algorithm` must be one of 'kmeans', 'spectral' or 'louvain'")
|
raise ValueError(f"`algorithm` must be one of 'kmeans', 'spectral' or 'louvain'. Is {algorithm}.")
|
||||||
|
|
||||||
return (n.buses.groupby(['country', 'sub_network'], group_keys=False, squeeze=True)
|
return (n.buses.groupby(['country', 'sub_network'], group_keys=False, squeeze=True)
|
||||||
.apply(busmap_for_country).rename('busmap'))
|
.apply(busmap_for_country).rename('busmap'))
|
||||||
|
@ -17,7 +17,7 @@ Description
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
from _helpers import (load_network, aggregate_p, aggregate_costs,
|
from _helpers import (load_network_for_plots, aggregate_p, aggregate_costs,
|
||||||
configure_logging)
|
configure_logging)
|
||||||
|
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
|
@ -22,7 +22,6 @@ import pypsa
|
|||||||
|
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
import matplotlib.pyplot as plt
|
import matplotlib.pyplot as plt
|
||||||
import logging
|
|
||||||
|
|
||||||
def cum_p_nom_max(net, tech, country=None):
|
def cum_p_nom_max(net, tech, country=None):
|
||||||
carrier_b = net.generators.carrier == tech
|
carrier_b = net.generators.carrier == tech
|
||||||
|
@ -29,7 +29,6 @@ This rule, as a substitute for :mod:`build_natura_raster`, downloads an already
|
|||||||
import logging
|
import logging
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
from pathlib import Path
|
|
||||||
from _helpers import progress_retrieve, configure_logging
|
from _helpers import progress_retrieve, configure_logging
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
@ -47,7 +47,6 @@ from _helpers import configure_logging
|
|||||||
|
|
||||||
import pypsa
|
import pypsa
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import re
|
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from vresutils.benchmark import memory_logger
|
from vresutils.benchmark import memory_logger
|
||||||
|
Loading…
Reference in New Issue
Block a user