Merge pull request #43 from Herb-AI/dev

Dev
Herb-AI · Jun 30, 2023 · 7880055 · 7880055
2 parents b866e57 + 2479f86
commit 7880055
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 27 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,12 +7,6 @@
 [submodule "HerbData.jl"]
 	path = HerbData.jl
 	url = https://github.com/Herb-AI/HerbData.jl.git
-[submodule "HerbBenchmarks.jl"]	
-	path = HerbBenchmarks.jl
-	url = https://github.com/Herb-AI/HerbBenchmarks.jl.git
-[submodule "HerbUtils.jl"]
-	path = HerbUtils.jl
-	url = https://github.com/Herb-AI/HerbUtils.jl.git
 [submodule "HerbEvaluation.jl"]
 	path = HerbEvaluation.jl
 	url = https://github.com/Herb-AI/HerbEvaluation.jl.git
@@ -22,3 +16,6 @@
 [submodule "HerbConstraints.jl"]
 	path = HerbConstraints.jl
 	url = https://github.com/Herb-AI/HerbConstraints.jl.git
+[submodule "HerbCore.jl"]
+	path = HerbCore.jl
+	url = https://github.com/Herb-AI/HerbCore.jl.git
diff --git a/HerbBenchmarks.jl b/HerbBenchmarks.jl
diff --git a/HerbConstraints.jl b/HerbConstraints.jl
diff --git a/HerbCore.jl b/HerbCore.jl
diff --git a/HerbData.jl b/HerbData.jl
diff --git a/HerbEvaluation.jl b/HerbEvaluation.jl
diff --git a/HerbExamples.jl b/HerbExamples.jl
diff --git a/HerbGrammar.jl b/HerbGrammar.jl
diff --git a/HerbSearch.jl b/HerbSearch.jl
diff --git a/HerbUtils.jl b/HerbUtils.jl
diff --git a/Project.toml b/Project.toml
@@ -2,3 +2,15 @@ name = "Herb"
 uuid = "c09c6b7f-4f63-49de-90d9-97a3563c0f4a"
 authors = ["Jaap de Jong <[email protected]>"]
 version = "0.1.0"
+
+[deps]
+AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
+DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
+TreeView = "39424ebd-4cf3-5550-a685-96706a953f40"
+Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[compat]
+AbstractTrees = "0.4"
+DataStructures = "0.17,0.18"
+TreeView = "0.5"
+julia = "1"
diff --git a/README.md b/README.md
@@ -1,17 +1,8 @@
 # Herb.jl
 
-Core functionality:
+## Introduction
 
-    install all dependencies
-    focus on user interaction, how the user should use the library: init, run, output
-
-Additional functionality:
-
-    benchmarking and basic config for default cases
-    template notebooks
-
-
-### Getting started
+## Getting started
 
 As this project is working with git-submodules, after cloning please run
 
@@ -26,4 +17,5 @@ To update each submodule to their latest master commit, please run
 git submodule update --rebase --remote
 ```
 
+## Conventions
 
diff --git a/src/Herb.jl b/src/Herb.jl
@@ -1,22 +1,25 @@
 module Herb
 
+include("../HerbCore.jl/src/HerbCore.jl")
 include("../HerbGrammar.jl/src/HerbGrammar.jl")
 include("../HerbConstraints.jl/src/HerbConstraints.jl")
 include("../HerbData.jl/src/HerbData.jl")
 include("../HerbEvaluation.jl/src/HerbEvaluation.jl")
 include("../HerbSearch.jl/src/HerbSearch.jl")
 
+using .HerbCore
 using .HerbGrammar
 using .HerbConstraints
 using .HerbData
 using .HerbEvaluation
 using .HerbSearch
 
 export 
+    HerbCore,
     HerbGrammars,
     HerbConstraints,
     HerbData,
     HerbEvaluation,
     HerbSearch
-
+    
 end # module
diff --git a/test/herb_test.jl b/test/herb_test.jl
@@ -2,6 +2,7 @@ module HerbTest
 
 include("../src/Herb.jl")
 
+using .Herb.HerbCore
 using .Herb.HerbGrammar
 using .Herb.HerbConstraints
 using .Herb.HerbEvaluation
@@ -14,7 +15,10 @@ using Test
     include("../HerbGrammar.jl/test/test_cfg.jl")
     include("../HerbGrammar.jl/test/test_csg.jl")
     include("../HerbConstraints.jl/test/test_propagators.jl")
-    include("../HerbSearch.jl/test/test_iterators.jl")
+    include("../HerbSearch.jl/test/test_algorithms.jl")
+    include("../HerbSearch.jl/test/test_context_free_iterators.jl")
+    include("../HerbSearch.jl/test/test_context_sensitive_iterators.jl")
+    include("../HerbSearch.jl/test/test_search_procedure.jl")
 end
 
 end # module
+54 −4		src/HerbConstraints.jl
+0 −27		src/comesafter.jl
+33 −0		src/context.jl
+194 −0		src/csg_annotated/csg_annotated.jl
+0 −23		src/forbidden.jl
+48 −0		src/localconstraints/local_condition.jl
+68 −0		src/localconstraints/local_forbidden.jl
+52 −0		src/localconstraints/local_one_of.jl
+225 −0		src/localconstraints/local_ordered.jl
+8 −0		src/matchfail.jl
+132 −0		src/matchnode.jl
+0 −26		src/ordered.jl
+132 −0		src/patternmatch.jl
+48 −0		src/propagatorconstraints/comesafter.jl
+43 −0		src/propagatorconstraints/condition.jl
+50 −0		src/propagatorconstraints/forbidden.jl
+44 −0		src/propagatorconstraints/forbidden_path.jl
+37 −0		src/propagatorconstraints/one_of.jl
+53 −0		src/propagatorconstraints/ordered.jl
+50 −0		src/propagatorconstraints/require_on_left.jl
+58 −0		src/rulenodematch.jl
+105 −12		test/test_propagators.jl
+7 −1		README.md
+0 −3		notebooks/README.md
+149 −76		notebooks/defining_grammars.ipynb
+90 −13		notebooks/getting_started_with_herb.ipynb
+3 −2		src/HerbExamples.jl
+0 −16		src/Herb_BFS.jl
+1 −0		Project.toml
+15 −17		src/HerbGrammar.jl
+71 −18		src/cfg/cfg.jl
+54 −13		src/cfg/probabilistic_cfg.jl
+0 −29		src/csg/context.jl
+83 −24		src/csg/csg.jl
+50 −10		src/csg/probabilistic_csg.jl
+97 −124		src/grammar_base.jl
+45 −20		src/grammar_io.jl
+46 −0		src/nodelocation.jl
+0 −65		src/recycler.jl
+0 −84		src/rulenode.jl
+163 −40		src/rulenode_operators.jl
+167 −0		src/sampling.jl
+32 −11		src/utils.jl
+55 −0		test/test_cfg.jl
+4 −4		test/test_csg.jl
+29 −9		src/HerbSearch.jl
+0 −199		src/cfg_enumerator.jl
+14 −119		src/cfg_priority_enumerator.jl
+17 −0		src/count_expressions.jl
+0 −224		src/csg_enumerator.jl
+206 −69		src/csg_priority_enumerator.jl
+97 −0		src/enumerator_constructors.jl
+5 −0		src/expression_iterator.jl
+109 −0		src/heuristics.jl
+203 −8		src/search_procedure.jl
+52 −0		src/stochastic_enumerators.jl
+63 −0		src/stochastic_functions/accept.jl
+21 −0		src/stochastic_functions/cost_functions.jl
+36 −0		src/stochastic_functions/neighbourhood.jl
+63 −0		src/stochastic_functions/propose.jl
+23 −0		src/stochastic_functions/temperature.jl
+154 −0		src/stochastic_search_iterator.jl
+0 −46		src/utils.jl
+288 −0		test/realistic_search_tests.jl
+96 −0		test/test_algorithms.jl
+35 −35		test/test_context_free_iterators.jl
+179 −0		test/test_context_sensitive_iterators.jl
+66 −0		test/test_search_procedure.jl