Merge pull request #132 from Herb-AI/compathelper/new_version/2024-12…

…-13-01-52-34-511-01072321669 CompatHelper: bump compat for HerbGrammar to 0.5
Herb-AI · Jan 21, 2025 · 8fe642a · 8fe642a · ReubenJ · Jan 21, 2025
2 parents 13e24a7 + 1a23938
commit 8fe642a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "HerbSearch"
 uuid = "3008d8e8-f9aa-438a-92ed-26e9c7b4829f"
 authors = ["Sebastijan Dumancic <s.dumancic@tudelft.nl>", "Jaap de Jong <J.deJong-18@student.tudelft.nl>", "Nicolae Filat <N.Filat@student.tudelft.nl>", "Piotr Cichoń <gitlab@gitlab.ewi.tudelft.nl>", "Tilman Hinnerichs <t.r.hinnerichs@tudelft.nl>"]
-version = "0.4.0"
+version = "0.4.1"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -16,12 +16,12 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 
 [compat]
 DataStructures = "0.17,0.18"
-HerbConstraints = "^0.2.0"
-HerbCore = "^0.3.0"
-HerbGrammar = "^0.4.0"
-HerbInterpret = "^0.1.3"
+HerbConstraints = "0.2.0"
+HerbCore = "0.3.0"
+HerbGrammar = "0.5"
+HerbInterpret = "0.1.3"
 HerbSpecification = "0.2"
-MLStyle = "^0.4.17"
-Random = "1.8.0,1.9.0,1.10.0,1.11.0"
-StatsBase = "^0.34"
-julia = "^1.8"
+MLStyle = "0.4.17"
+Random = "1.8.0"
+StatsBase = "0.34"
+julia = "1.8"
diff --git a/src/search_procedure.jl b/src/search_procedure.jl
@@ -35,7 +35,7 @@ function synth(
 )::Union{Tuple{RuleNode, SynthResult}, Nothing}
     start_time = time()
     grammar = get_grammar(iterator.solver)
-    symboltable :: SymbolTable = SymbolTable(grammar, mod)
+    symboltable :: SymbolTable = grammar2symboltable(grammar, mod)
 
     best_score = 0
     best_program = nothing

diff --git a/src/stochastic_iterator.jl b/src/stochastic_iterator.jl
@@ -161,7 +161,7 @@ function _calculate_cost(program::Union{RuleNode, StateHole}, cost_function::Fun
     results = Tuple{<:Number,<:Number}[]
 
     expression = rulenode2expr(program, grammar)
-    symbol_table = SymbolTable(grammar)
+    symbol_table = grammar2symboltable(grammar)
 
     for example ∈ filter(e -> e isa IOExample, spec)
         outcome = evaluation_function(symbol_table, expression, example.in)

diff --git a/test/test_realistic_searches.jl b/test/test_realistic_searches.jl
@@ -19,7 +19,7 @@
         problem = Problem(examples)
         solution = search(g₁, problem, :Element, max_depth=3)
 
-        @test execute_on_input(SymbolTable(g₁), solution, Dict(:x => -2)) == 4
+        @test execute_on_input(grammar2symboltable(g₁), solution, Dict(:x => -2)) == 4
     end
 
     @testset "Small domain, large operators" begin
@@ -46,7 +46,7 @@
         problem = Problem(examples)
         solution = search(g₂, problem, :Element)
 
-        @test execute_on_input(SymbolTable(g₂), solution, Dict(:x => 0)) == 4
+        @test execute_on_input(grammar2symboltable(g₂), solution, Dict(:x => 0)) == 4
     end
 
     @testset "Large domain, small operators" begin
@@ -69,8 +69,8 @@
         problem = Problem(examples)
         solution = search(g₃, problem, :Element)
 
-        @test execute_on_input(SymbolTable(g₃), solution, Dict(:x => 0)) == 1
-        @test execute_on_input(SymbolTable(g₃), solution, Dict(:x => 100)) == 101
+        @test execute_on_input(grammar2symboltable(g₃), solution, Dict(:x => 0)) == 1
+        @test execute_on_input(grammar2symboltable(g₃), solution, Dict(:x => 100)) == 101
     end
 
     @testset "Large domain, large operators" begin
@@ -97,7 +97,7 @@
         problem = Problem(examples)
         solution = search(g₄, problem, :Element)
 
-        @test execute_on_input(SymbolTable(g₄), solution, Dict(:x => 100)) == 418
+        @test execute_on_input(grammar2symboltable(g₄), solution, Dict(:x => 100)) == 418
     end
 
     @testset "Large domain with if-statements" begin
@@ -132,6 +132,6 @@
         problem = Problem(examples)
         solution = search(g₅, problem, :Element)
 
-        @test execute_on_input(SymbolTable(g₅), solution, Dict(:x => 3)) == 5
+        @test execute_on_input(grammar2symboltable(g₅), solution, Dict(:x => 3)) == 5
     end    
 end
diff --git a/test/test_search_procedure.jl b/test/test_search_procedure.jl
@@ -13,7 +13,7 @@
         solution, flag = synth(problem, iterator)
         program = rulenode2expr(solution, g₁)
 
-        @test execute_on_input(SymbolTable(g₁), program, Dict(:x => 6)) == 2*6+1
+        @test execute_on_input(grammar2symboltable(g₁), program, Dict(:x => 6)) == 2*6+1
     end
 
     @testset "Search max_enumerations stopping condition" begin
@@ -47,7 +47,7 @@
         program = rulenode2expr(solution, g₁)
 
         @test flag == suboptimal_program
-        @test execute_on_input(SymbolTable(g₁), program, Dict(:x => 6)) == 2*6+1
+        @test execute_on_input(grammar2symboltable(g₁), program, Dict(:x => 6)) == 2*6+1
 
     end