Merge pull request #2 from he32/new-networx

Work also with newer networkx (tested with 2.1).

model.py

@@ -1504,7 +1504,7 @@ class Simulation:
 
          self.graph.add_node(router)
          for (u, v, w) in edges:
-            self.graph.add_edge(u, v, w)
+            self.graph.add_edge(u, v, **w)
 
       del self.changes[idx]
 

pajek.py

@@ -85,9 +85,9 @@ def parse_pajek(lines):
                 edge_data.update(extra_attr)
                 if G.has_edge(u,v):
                     if G[u][v]['value'] > float(w):
-                        G.add_edge(u,v,edge_data)
+                        G.add_edge(u,v,**edge_data)
                 else:
-                    G.add_edge(u,v,edge_data)
+                    G.add_edge(u,v,**edge_data)
     if not G.name:
         raise Exception("No graph definition found")
     if len(G.nodes()) == 0: