Merge pull request #6 from fneum/nodes

G.node -> G.nodes

setup.py

@@ -18,7 +18,7 @@
     packages=find_packages(exclude=['doc', 'test']),
     install_requires=['countrycode', 'fiona', 'matplotlib',
                       'memory_profiler',
-                      'networkx>=1.10', 'numpy', 'pandas>=0.19.0',
+                      'networkx>=2', 'numpy', 'pandas>=0.19.0',
                       'pyomo', 'scipy', 'pyproj', 'pyshp', 'rasterio>=1.0',
                       'shapely', 'six'],
     classifiers=[

vresutils/dispatch.py

@@ -193,10 +193,10 @@ def nutsidofaplant(x):
         try:
             nregs = iso2_to_nuts[name_to_iso2[x['Country']]]
             for n in nregs:
-                if G.node[n]['region'].contains(p):
+                if G.nodes[n]['region'].contains(p):
                     return n
             else:
-                return min(nregs, key=lambda n: G.node[n]['region'].distance(p))
+                return min(nregs, key=lambda n: G.nodes[n]['region'].distance(p))
         except KeyError:
             return np.NaN
 

vresutils/graph.py

@@ -187,7 +187,7 @@ def cell_subgraph(G, lat, lon, size, copy=True):
 
     pos = np.array((lon, lat))
     nodes = (n
-             for n, p in iteritems(G.node)
+             for n, p in iteritems(G.nodes)
              if np.abs(p['pos'] - pos).max() <= size/2)
     return giant_component(G.subgraph(nodes), copy=copy)
 
@@ -200,7 +200,7 @@ def polygon_subgraph(G, polygon, nneighbours=0, copy=True):
     """
 
     nodes = set(n
-                for n, p in iteritems(G.node)
+                for n, p in iteritems(G.nodes)
                 if polygon.contains(Point(p['pos'])))
 
     if nneighbours > 0:
@@ -250,7 +250,7 @@ def add_node(n):
         if n in queue:
             return queue[n]
 
-        attr_dict = G.node[n]
+        attr_dict = G.nodes[n]
         pos = Point(attr_dict['pos'])
         if polygon.contains(pos):
             # in Polygon: keep it
@@ -353,7 +353,7 @@ def do_node(n):
         if n in queue:
             return queue[n]
 
-        pos = Point(G.node[n]['pos'])
+        pos = Point(G.nodes[n]['pos'])
         # this two-step procedure checks the last successful shape
         # first, as we are link-hopping through the graph
         if do_node.shape.contains(pos):
@@ -452,7 +452,7 @@ def edge_attrs(H, n1, n2, d):
         return a
 
     for n in neigh_nodes:
-        pos = Point(G.node[n]['pos'])
+        pos = Point(G.nodes[n]['pos'])
         for n2, reg in iteritems(regions):
             if reg.contains(pos):
                 H.add_edges_from((n2, n3, edge_attrs(H, n2, n3, d))
@@ -462,7 +462,7 @@ def edge_attrs(H, n1, n2, d):
     return H
 
 def get_voronoi_regions(G, outline=None):
-    if 'region' not in next(itervalues(G.node)):
+    if 'region' not in next(itervalues(G.nodes)):
         if callable(outline):
             outline = outline()
         assert outline is not None
@@ -559,7 +559,7 @@ def edge_to_shape(e):
             if nm1 == nm2:
                 return nm1
             else:
-                ls = LineString([G.node[n1]['pos'], G.node[n2]['pos']])
+                ls = LineString([G.nodes[n1]['pos'], G.nodes[n2]['pos']])
                 def length(nm):
                     return ls.intersection(shapes[nm]).length if nm is not None else 0
                 l1 = length(nm1)
@@ -799,7 +799,7 @@ def convert_node_labels_to_integers(G):
     return relabel_nodes(G, dict(zip(G.nodes(), count())))
 
 def get_node_attributes(G, attr):
-    return OrderedDict((n, d[attr]) for n, d in iteritems(G.node))
+    return OrderedDict((n, d[attr]) for n, d in iteritems(G.nodes))
 
 def get_edge_attributes(G, attr):
     return OrderedDict(((u, v), d[attr]) for u, v, d in iteritems(G.edges_iter(data=True)))

vresutils/grid.py

@@ -163,7 +163,7 @@ def node_distance(G, n1, n2):
     d : float
         distance
     """
-    return 110. * np.sqrt(np.sum((G.node[n1]['pos'] - G.node[n2]['pos'])**2))
+    return 110. * np.sqrt(np.sum((G.nodes[n1]['pos'] - G.nodes[n2]['pos'])**2))
 
 def heuristically_extend_edge_attributes(G, it=None):
     if it is None:

vresutils/shapes.py

@@ -276,7 +276,7 @@ def save_graph_as_shapes(G, nodes_fn, links_fn):
     extractor = itemgetter(*map(itemgetter(0), sf_links.fields))
 
     for n1, n2, d in G.edges_iter(data=True):
-        sf_links.line(parts=[[list(G.node[n]['pos']) for n in (n1, n2)]])
+        sf_links.line(parts=[[list(G.nodes[n]['pos']) for n in (n1, n2)]])
         sf_links.record(*extractor(d))
 
     sf_links.save(links_fn)