Update traversal.jl

only visit each node once

Author: VEZY

src/dependencies/traversal.jl

@@ -39,40 +39,55 @@ function traverse_dependency_graph(
     visit_hard_dep=true
 )
     var = []
+    node_visited = Set()
     for (p, root) in graph.roots
-        traverse_dependency_graph!(root, f, var; visit_hard_dep=visit_hard_dep)
+        traverse_dependency_graph!(root, f, var; visit_hard_dep=visit_hard_dep, node_visited=node_visited)
     end
 
     return var
 end
 
 
-function traverse_dependency_graph!(f::Function, graph::DependencyGraph; visit_hard_dep=true)
+function traverse_dependency_graph!(f::Function, graph::DependencyGraph; visit_hard_dep=true, node_visited::Set{AbstractDependencyNode}=Set())
     for (p, root) in graph.roots
-        traverse_dependency_graph!(f, root, visit_hard_dep=visit_hard_dep)
+        traverse_dependency_graph!(f, root, visit_hard_dep=visit_hard_dep, node_visited=node_visited)
     end
 end
 
-function traverse_dependency_graph!(f::Function, node::SoftDependencyNode; visit_hard_dep=true)
+function traverse_dependency_graph!(f::Function, node::SoftDependencyNode; visit_hard_dep=true, node_visited::Set{AbstractDependencyNode}=Set())
+    if node in node_visited
+        return nothing
+    end
+
     f(node)
+
+    push!(node_visited, node)
+
     # Traverse the hard dependencies of the SoftDependencyNode if any:
     if visit_hard_dep && node isa SoftDependencyNode
         # draw a branching guide if there's more soft dependencies after this one:
         for child in node.hard_dependency
-            traverse_dependency_graph!(f, child)
+            traverse_dependency_graph!(f, child; visit_hard_dep=visit_hard_dep, node_visited=node_visited)
         end
     end
 
     for child in node.children
-        traverse_dependency_graph!(f, child; visit_hard_dep=visit_hard_dep)
+        traverse_dependency_graph!(f, child; visit_hard_dep=visit_hard_dep, node_visited=node_visited)
     end
 end
 
-function traverse_dependency_graph!(f::Function, node::HardDependencyNode; visit_hard_dep=true)
+function traverse_dependency_graph!(f::Function, node::HardDependencyNode; visit_hard_dep=true, node_visited::Set{AbstractDependencyNode}=Set())
+    if node in node_visited
+        return nothing
+    end
+
     f(node)
+
+    push!(node_visited, node)
+
     # Traverse all hard dependencies:
     for child in node.children
-        traverse_dependency_graph!(f, child)
+        traverse_dependency_graph!(f, child; visit_hard_dep=visit_hard_dep, node_visited=node_visited)
     end
 end
 
@@ -89,20 +104,27 @@ function traverse_dependency_graph!(
     node::SoftDependencyNode,
     f::Function,
     var::Vector;
-    visit_hard_dep=true
+    visit_hard_dep=true,
+    node_visited::Set{AbstractDependencyNode}=Set()
 )
+    if node in node_visited
+        return nothing
+    end
+
     push!(var, node.process => f(node))
 
+    push!(node_visited, node)
+
     # Traverse the hard dependencies of the SoftDependencyNode if any:
     if visit_hard_dep && node isa SoftDependencyNode
         # draw a branching guide if there's more soft dependencies after this one:
         for child in node.hard_dependency
-            traverse_dependency_graph!(child, f, var)
+            traverse_dependency_graph!(child, f, var; visit_hard_dep=visit_hard_dep, node_visited=node_visited)
         end
     end
 
     for child in node.children
-        traverse_dependency_graph!(child, f, var; visit_hard_dep=visit_hard_dep)
+        traverse_dependency_graph!(child, f, var; visit_hard_dep=visit_hard_dep, node_visited=node_visited)
     end
 end
 
@@ -117,11 +139,18 @@ function traverse_dependency_graph!(
     node::HardDependencyNode,
     f::Function,
     var::Vector;
-    visit_hard_dep=true  # Just to be compatible with a call shared with SoftDependencyNode method
+    visit_hard_dep=true,  # Just to be compatible with a call shared with SoftDependencyNode method
+    node_visited::Set{AbstractDependencyNode}=Set()
 )
+    if node in node_visited
+        return nothing
+    end
+
     push!(var, node.process => f(node))
 
+    push!(node_visited, node)
+
     for child in node.children
-        traverse_dependency_graph!(child, f, var)
+        traverse_dependency_graph!(child, f, var; visit_hard_dep=visit_hard_dep, node_visited=node_visited)
     end
 end