Merge pull request #131 from Herb-AI/remove_fixedshape_iterator

Remove `FixedShapedIterator`

Project.toml

@@ -1,7 +1,7 @@
 name = "HerbSearch"
 uuid = "3008d8e8-f9aa-438a-92ed-26e9c7b4829f"
 authors = ["Sebastijan Dumancic <[email protected]>", "Jaap de Jong <[email protected]>", "Nicolae Filat <[email protected]>", "Piotr Cichoń <[email protected]>", "Tilman Hinnerichs <[email protected]>"]
-version = "0.3.1"
+version = "0.4.0"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -10,7 +10,6 @@ HerbCore = "2b23ba43-8213-43cb-b5ea-38c12b45bd45"
 HerbGrammar = "4ef9e186-2fe5-4b24-8de7-9f7291f24af7"
 HerbInterpret = "5bbddadd-02c5-4713-84b8-97364418cca7"
 HerbSpecification = "6d54aada-062f-46d8-85cf-a1ceaf058a06"
-Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
@@ -23,12 +22,6 @@ HerbGrammar = "^0.4.0"
 HerbInterpret = "^0.1.3"
 HerbSpecification = "^0.1.0"
 MLStyle = "^0.4.17"
+Random = "1.8.0,1.9.0,1.10.0,1.11.0"
 StatsBase = "^0.34"
 julia = "^1.8"
-
-[extras]
-LegibleLambdas = "f1f30506-32fe-5131-bd72-7c197988f9e5"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-
-[targets]
-test = ["Test", "LegibleLambdas"]

src/HerbSearch.jl

@@ -16,7 +16,6 @@ include("uniform_iterator.jl")
 
 include("heuristics.jl")
 
-include("fixed_shaped_iterator.jl")
 include("top_down_iterator.jl")
 
 include("evaluate.jl")
@@ -42,8 +41,6 @@ export
   ProgramIterator,
   @programiterator,
 
-  ContextSensitivePriorityEnumerator,
-
   heuristic_leftmost,
   heuristic_rightmost,
   heuristic_random,
@@ -56,7 +53,6 @@ export
   optimal_program,
   suboptimal_program,
 
-  FixedShapedIterator,
   UniformIterator,
   next_solution!,
 

test/Project.toml

@@ -0,0 +1,12 @@
+[deps]
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
+HerbConstraints = "1fa96474-3206-4513-b4fa-23913f296dfc"
+HerbCore = "2b23ba43-8213-43cb-b5ea-38c12b45bd45"
+HerbGrammar = "4ef9e186-2fe5-4b24-8de7-9f7291f24af7"
+HerbInterpret = "5bbddadd-02c5-4713-84b8-97364418cca7"
+HerbSearch = "3008d8e8-f9aa-438a-92ed-26e9c7b4829f"
+HerbSpecification = "6d54aada-062f-46d8-85cf-a1ceaf058a06"
+LegibleLambdas = "f1f30506-32fe-5131-bd72-7c197988f9e5"
+Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

test/runtests.jl

@@ -5,12 +5,14 @@ using HerbInterpret
 using HerbConstraints
 using HerbSpecification
 using Test
+using Aqua
 
 include("test_helpers.jl")
 using Random
 Random.seed!(1234)
 
 @testset "HerbSearch.jl" verbose=true begin
+    @testset "Aqua" Aqua.test_all(HerbSearch, piracies = (treat_as_own=[RuleNode, AbstractGrammar],))
     include("test_search_procedure.jl")        
     include("test_context_free_iterators.jl")
     include("test_sampling.jl")