Chnage names of pypsa modules

openego · Oct 10, 2023 · 254c6d6 · 254c6d6
1 parent 378fe5c
commit 254c6d6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/etrago/cluster/electrical.py b/etrago/cluster/electrical.py
@@ -27,7 +27,7 @@
     import logging
 
     from pypsa import Network
-    from pypsa.networkclustering import (
+    from pypsa.clustering.spatial import (
         aggregatebuses,
         aggregategenerators,
         aggregateoneport,

diff --git a/etrago/cluster/gas.py b/etrago/cluster/gas.py
@@ -27,7 +27,7 @@
     import logging
 
     from pypsa import Network
-    from pypsa.networkclustering import (
+    from pypsa.clustering.spatial import (
         aggregatebuses,
         aggregateoneport,
         busmap_by_kmeans,

diff --git a/etrago/cluster/spatial.py b/etrago/cluster/spatial.py
@@ -30,8 +30,8 @@
     import multiprocessing as mp
 
     from networkx import NetworkXNoPath
-    from pypsa.networkclustering import (
-        _flatten_multiindex,
+    from pypsa.clustering.spatial import (
+        flatten_multiindex,
         busmap_by_kmeans,
         busmap_by_stubs,
         get_clustering_from_busmap,
@@ -237,7 +237,7 @@ def arrange_dc_bus0_bus1(network):
     strategies = strategies_links()
     strategies.update(cus_strateg)
     new_df = links.groupby(grouper, axis=0).agg(strategies)
-    new_df.index = _flatten_multiindex(new_df.index).rename("name")
+    new_df.index = flatten_multiindex(new_df.index).rename("name")
     new_df = pd.concat(
         [new_df, network.links.loc[~links_agg_b]], axis=0, sort=False
     )
@@ -257,7 +257,7 @@ def arrange_dc_bus0_bus1(network):
                         weighting.loc[df_agg.columns], axis=1
                     )
                 pnl_df = df_agg.groupby(grouper, axis=1).sum()
-                pnl_df.columns = _flatten_multiindex(pnl_df.columns).rename(
+                pnl_df.columns = flatten_multiindex(pnl_df.columns).rename(
                     "name"
                 )
                 new_pnl[attr] = pd.concat(

diff --git a/etrago/tools/constraints.py b/etrago/tools/constraints.py
@@ -27,7 +27,7 @@
 from pyomo.environ import Constraint
 from pypsa.descriptors import expand_series
 from pypsa.linopt import define_constraints, define_variables, get_var, linexpr
-from pypsa.pf import get_switchable_as_dense as get_as_dense
+from pypsa.descriptors import get_switchable_as_dense as get_as_dense
 import numpy as np
 import pandas as pd
 import pyomo.environ as po

diff --git a/etrago/tools/execute.py b/etrago/tools/execute.py
@@ -28,7 +28,7 @@
     import time
 
     from pypsa.linopf import network_lopf
-    from pypsa.networkclustering import aggregategenerators
+    from pypsa.clustering.spatial import aggregategenerators
     from pypsa.pf import sub_network_pf
     import numpy as np
     import pandas as pd