diff --git a/Project.toml b/Project.toml index f81e6422..99353d70 100644 --- a/Project.toml +++ b/Project.toml @@ -12,6 +12,7 @@ HerbInterpret = "5bbddadd-02c5-4713-84b8-97364418cca7" HerbSpecification = "6d54aada-062f-46d8-85cf-a1ceaf058a06" Logging = "56ddb016-857b-54e1-b83d-db4d58db5568" MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078" +Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" diff --git a/src/HerbSearch.jl b/src/HerbSearch.jl index 4c576f12..85934ce9 100644 --- a/src/HerbSearch.jl +++ b/src/HerbSearch.jl @@ -9,6 +9,7 @@ using HerbInterpret using HerbSpecification using MLStyle + include("sampling_grammar.jl") include("program_iterator.jl") diff --git a/test/runtests.jl b/test/runtests.jl index d127e8e7..018d7992 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -5,29 +5,32 @@ using HerbInterpret using HerbConstraints using HerbSpecification using Test +`` +using Pkg +# Pkg.add(name="HerbGrammar",rev="fix-normalizing") include("test_helpers.jl") using Random Random.seed!(1234) @testset "HerbSearch.jl" verbose=true begin - include("test_search_procedure.jl") - include("test_context_free_iterators.jl") - include("test_sampling.jl") - include("test_stochastic/test_stochastic.jl") - include("test_genetic.jl") - include("test_programiterator_macro.jl") + # include("test_search_procedure.jl") + # include("test_context_free_iterators.jl") + # include("test_sampling.jl") + # include("test_stochastic/test_stochastic.jl") + # include("test_genetic.jl") + # include("test_programiterator_macro.jl") - include("test_uniform_iterator.jl") - include("test_forbidden.jl") - include("test_ordered.jl") - include("test_contains.jl") + # include("test_uniform_iterator.jl") + # include("test_forbidden.jl") + # include("test_ordered.jl") + # include("test_contains.jl") include("test_probe.jl") - include("test_newprograms.jl") - include("test_contains_subtree.jl") - include("test_unique.jl") + # include("test_newprograms.jl") + # include("test_contains_subtree.jl") + # include("test_unique.jl") - include("test_constraints.jl") + # include("test_constraints.jl") # Excluded because it contains long tests # include("test_realistic_searches.jl") diff --git a/test/test_probe.jl b/test/test_probe.jl index 15bb953a..2c7e50af 100644 --- a/test/test_probe.jl +++ b/test/test_probe.jl @@ -243,9 +243,6 @@ end for cost_func ∈ cost_functions for select_func ∈ select_functions for grammar_to_use ∈ [uniform_grammar, grammar] - @testset "Uniform grammar is uniform" begin - sum(exp.(grammar.log_probabilities)) ≈ 1 - end # overwrite calculate cost HerbSearch.calculate_rule_cost(rule_index::Int, g::ContextSensitiveGrammar) = cost_func(rule_index, g) # overwrite select function