visual and merger

Author: AceSrc

cyaron/merger.py

@@ -31,8 +31,11 @@ def add_edge(self, u, v, **kwargs):
                         self.graphs[ v[0] ].offset + v[1], 
                         weight=kwargs.get("weight", 1)) 
 
-    def result(self):
-        return self.G
+    def to_str(self, **kwargs):
+        return self.G.to_str(**kwargs)
+    
+    def __str__(self):
+        return self.to_str()
 
     @staticmethod
     def component(point_count, edge_count, **kwargs):
@@ -51,4 +54,4 @@ def component(point_count, edge_count, **kwargs):
         for i in xrange(real_count):
             graphs[i] = Graph.graph(point_count, edge_count, **kwargs)
         G = Merger(*graphs)
-        return G.result() 
+        return G.G

cyaron/visual.py

@@ -1,13 +1,14 @@
 from .graph import * 
+from .merger import Merger
 import pygraphviz as pgv
 
-def visualize(graph, **kwargs):
+def visualize(graph, output_path="a.png"):
     """visualize(graph, **kwargs) -> None
-        Graph graph -> the graph that will be visualized
-        **kwargs(Keyword args):
-            string outptu_file -> the path of the image
+        Graph/Merger graph -> the graph/Merger that will be visualized
+        string output_path-> the output path of the image
     """
-    output_file = kwargs.get("output_file", "a.png")
+
+    if isinstance(graph, Merger): graph = Merger.G
     G = pgv.AGraph(directed=graph.directed)
 
     G.add_nodes_from([i for i in xrange(1, len(graph.edges))])
@@ -20,6 +21,6 @@ def visualize(graph, **kwargs):
     G.edge_attr['arrowhead'] = 'open'
 
     G.layout(prog='dot')
-    G.draw(output_file)
+    G.draw(output_path)