improved node_depth speed, fixed test for sample

sisl · Oct 5, 2017 · 8bd4a92 · 8bd4a92
1 parent 4e2f3a3
commit 8bd4a92
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/ExprRules.jl b/src/ExprRules.jl
@@ -321,12 +321,12 @@ end
 Return the depth of node for an expression tree rooted at root.  Depth is 1 when root == node.
 """
 function node_depth(root::RuleNode, node::RuleNode)
-    root == node && return 1
-    c_max = 0
+    root === node && return 1
     for c in root.children
-        c_max = max(c_max, node_depth(c, node))
+        d = node_depth(c, node)
+        d > 0 && (return d+1)
     end
-    c_max > 0 ? c_max+1 : 0
+    return 0
 end
 
 """

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -72,12 +72,12 @@ let
     @test !completed #should throw an error for not found
 
     @test length(unique([sample(rulenode, 1) for i=1:10])) == 1
-    @test length(unique([sample(rulenode, 2) for i=1:10])) == 2
-    @test length(unique([sample(rulenode, 3) for i=1:10])) == 3
+    @test length(unique([sample(rulenode, 2) for i=1:10])) <= 2
+    @test length(unique([sample(rulenode, 3) for i=1:10])) <= 3
 
     @test length(unique([sample(NodeLoc, rulenode, 1) for i=1:10])) == 1
-    @test length(unique([sample(NodeLoc, rulenode, 2) for i=1:10])) == 2
-    @test length(unique([sample(NodeLoc, rulenode, 3) for i=1:10])) == 3
+    @test length(unique([sample(NodeLoc, rulenode, 2) for i=1:10])) <= 2
+    @test length(unique([sample(NodeLoc, rulenode, 3) for i=1:10])) <= 3
 
     @test sample(NodeLoc, rulenode, :R, grammar, 1) == NodeLoc(rulenode, 0)
     @test sample(NodeLoc, rulenode, :R, grammar, 2) == NodeLoc(rulenode, 0)