fixup! Optional topologically sorted graph.

faustedition · Jul 19, 2020 · c2b4c07 · c2b4c07
1 parent f20b7e1
commit c2b4c07
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/macrogen/graph.py b/src/macrogen/graph.py
@@ -752,9 +752,10 @@ def order_graph(self, graph: nx.MultiDiGraph) -> nx.MultiDiGraph:
 
         for u, v in windowed(ref_order, 2):
             if result.has_edge(u, v, 0):
-                result[u][v][0]['weight'] = 1
+                result[u][v][0]['weight'] = 100
             else:
-                result.add_edge(u, v, penwidth=0, dir='none', weight=1)
+                result.add_edge(u, v, penwidth=0, dir='none', weight=100)
+            result[u][v][0]['topo'] = True
         return result
 
 

diff --git a/src/macrogen/visualize.py b/src/macrogen/visualize.py
@@ -161,6 +161,8 @@ def write_dot(graph: nx.MultiDiGraph, target: Union[PathLike, str] = 'base_graph
             for styled_attr in attr.keys() & style['edge']:
                 if attr[styled_attr]:
                     simplified.edges[u, v, k].update(style['edge'][styled_attr])
+            if 'topo' in attr and 'constraint' in attr:
+                del attr['constraint']
 
     if 'node' in style:
         for node, attr in simplified.nodes(data=True):