Reimplemented and corrected Graph as MultiGraph

lantz · lantz · commit 5b48a7d92c24 · 2013-07-30T11:51:32.000-07:00
fixes mininet#172
diff --git a/mininet/topo.py b/mininet/topo.py
@@ -13,23 +13,22 @@
 
 from mininet.util import irange, natural, naturalSeq
 
-class Graph( object ):
+class MultiGraph( object ):
     "Utility class to track nodes and edges - replaces networkx.Graph"
 
     def __init__( self ):
         self.data = {}
 
     def add_node( self, node ):
         "Add node to graph"
-        if node not in self.data.keys():
-            self.data[ node ] = []
+        self.data.setdefault( node, [] )
 
     def add_edge( self, src, dest ):
         "Add edge to graph"
+        src, dest = sorted( ( src, dest ) )
         self.add_node( src )
         self.add_node( dest )
         self.data[ src ].append( dest )
-        self.data[ dest ].append( src )
 
     def nodes( self ):
         "Return list of graph nodes"
@@ -54,7 +53,7 @@ def __init__(self, hopts=None, sopts=None, lopts=None):
            hinfo: default host options
            sopts: default switch options
            lopts: default link options"""
-        self.g = Graph()
+        self.g = MultiGraph()
         self.node_info = {}
         self.link_info = {}  # (src, dst) tuples hash to EdgeInfo objects
         self.hopts = {} if hopts is None else hopts
