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

Merge pull request #281 from PyPSA/fix-scipy-import

Browse Source 
base_network.py: fix scipy spatial import
This commit is contained in:
Fabian Neumann 2021-11-04 10:26:16 +01:00 committed by GitHub
commit 9c85179432
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/base_network.py
View File

@ -70,9 +70,9 @@ 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
import networkx as nx import networkx as nx
from scipy import spatial
from scipy.sparse import csgraph from scipy.sparse import csgraph
from itertools import product from itertools import product
@ -101,7 +101,7 @@ def _find_closest_links(links, new_links, distance_upper_bound=1.5):
for s in links.geometry]) for s in links.geometry])
querycoords = np.vstack([new_links[['x1', 'y1', 'x2', 'y2']], querycoords = np.vstack([new_links[['x1', 'y1', 'x2', 'y2']],
new_links[['x2', 'y2', 'x1', 'y1']]]) new_links[['x2', 'y2', 'x1', 'y1']]])
tree = sp.spatial.KDTree(treecoords) tree = spatial.KDTree(treecoords)
dist, ind = tree.query(querycoords, distance_upper_bound=distance_upper_bound) dist, ind = tree.query(querycoords, distance_upper_bound=distance_upper_bound)
found_b = ind < len(links) found_b = ind < len(links)
found_i = np.arange(len(new_links)*2)[found_b] % len(new_links) found_i = np.arange(len(new_links)*2)[found_b] % len(new_links)
@ -214,7 +214,7 @@ def _add_links_from_tyndp(buses, links):
links_tyndp = links_tyndp.loc[links_tyndp["j"].isnull()] links_tyndp = links_tyndp.loc[links_tyndp["j"].isnull()]
if links_tyndp.empty: return buses, links if links_tyndp.empty: return buses, links
tree = sp.spatial.KDTree(buses[['x', 'y']]) tree = spatial.KDTree(buses[['x', 'y']])
_, ind0 = tree.query(links_tyndp[["x1", "y1"]]) _, ind0 = tree.query(links_tyndp[["x1", "y1"]])
ind0_b = ind0 < len(buses) ind0_b = ind0 < len(buses)
links_tyndp.loc[ind0_b, "bus0"] = buses.index[ind0[ind0_b]] links_tyndp.loc[ind0_b, "bus0"] = buses.index[ind0[ind0_b]]