get_node_path to get_path

Herb-AI · Apr 16, 2024 · 2690e72 · 2690e72
1 parent b3fdd02
commit 2690e72
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/stochastic_iterator.jl b/src/stochastic_iterator.jl
@@ -116,7 +116,7 @@ function Base.iterate(iter::StochasticSearchIterator, iterator_state::IteratorSt
 
     # remove the rule node by substituting it with a hole of the same symbol
     original_node = get(current_program, neighbourhood_node_location)
-    path = get_node_path(current_program, original_node)
+    path = get_path(current_program, original_node)
     original_state = save_state!(solver)
 
     remove_node!(solver, path)

diff --git a/test/test_forbidden.jl b/test/test_forbidden.jl
@@ -67,9 +67,9 @@ using HerbCore, HerbGrammar, HerbConstraints
                     RuleNode(1), 
                     RuleNode(1)
                 ]), 
-                FixedShapedAbstractHole(BitVector((1, 1, 0, 0)), [])
+                UniformHole(BitVector((1, 1, 0, 0)), [])
             ]), 
-            FixedShapedAbstractHole(BitVector((0, 0, 1, 1)), [
+            UniformHole(BitVector((0, 0, 1, 1)), [
                 RuleNode(3, [
                     RuleNode(1), 
                     RuleNode(1)
@@ -82,7 +82,7 @@ using HerbCore, HerbGrammar, HerbConstraints
         iter = BFSIterator(grammar, :Number, solver=solver)
         new_state!(solver, partial_tree)
         trees = collect(iter)
-        @test length(trees) == 3 # 3 out of the 4 combinations to fill the FixedShapedHoles are valid
+        @test length(trees) == 3 # 3 out of the 4 combinations to fill the UniformHole are valid
     end
 
     @testset "DomainRuleNode" begin

diff --git a/test/test_sampling.jl b/test/test_sampling.jl
@@ -76,11 +76,11 @@ using Random
         end
         for remaining_depth in 1:10
 
-            skeleton = AbstractHole(BitVector((true,true,true,true,true)))
+            skeleton = Hole(BitVector((true,true,true,true,true)))
             rulenode = RuleNode(
                 5,[RuleNode(1), skeleton]
             )
-            path_to_skeleton = get_node_path(rulenode,skeleton)
+            path_to_skeleton = get_path(rulenode,skeleton)
             constraint = Contains(3)
 
             addconstraint!(grammar, constraint)