diff --git a/.gitmodules b/.gitmodules index bb96593..3e573b0 100644 --- 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 deleted file mode 160000 index 4950475..0000000 --- a/HerbBenchmarks.jl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4950475523ae5f63b70a2c37a2a5afc83ad696cc diff --git a/HerbConstraints.jl b/HerbConstraints.jl index 4e9ece4..70a3028 160000 --- a/HerbConstraints.jl +++ b/HerbConstraints.jl @@ -1 +1 @@ -Subproject commit 4e9ece42e309d748dd15c38c9150e557ebb77639 +Subproject commit 70a30281e682ce958795bed0eb5f5497338ea980 diff --git a/HerbCore.jl b/HerbCore.jl new file mode 160000 index 0000000..5b6bea2 --- /dev/null +++ b/HerbCore.jl @@ -0,0 +1 @@ +Subproject commit 5b6bea239a1fb749b790eb4d29f7af76490e7a48 diff --git a/HerbData.jl b/HerbData.jl index ed7750b..c3fea17 160000 --- a/HerbData.jl +++ b/HerbData.jl @@ -1 +1 @@ -Subproject commit ed7750b2a4172762e12d8cf0c54ceda948675cac +Subproject commit c3fea17db7439e3f5d338e1ccc3e6a2db139599f diff --git a/HerbEvaluation.jl b/HerbEvaluation.jl index 15820b9..a0f8efe 160000 --- a/HerbEvaluation.jl +++ b/HerbEvaluation.jl @@ -1 +1 @@ -Subproject commit 15820b9e8dc42e568bfbec4b16fe4d9e45320063 +Subproject commit a0f8efed486d405b59003a53637987a4b9b62614 diff --git a/HerbExamples.jl b/HerbExamples.jl index ed0896c..3d0825e 160000 --- a/HerbExamples.jl +++ b/HerbExamples.jl @@ -1 +1 @@ -Subproject commit ed0896c4bb3262e4ce2bc7303a06df78b6352790 +Subproject commit 3d0825e1e010eff000ad0fb00fb32d09dbcc2f6d diff --git a/HerbGrammar.jl b/HerbGrammar.jl index a183309..0914379 160000 --- a/HerbGrammar.jl +++ b/HerbGrammar.jl @@ -1 +1 @@ -Subproject commit a1833092d4624b94bc4458519ea4bf01ae13a08f +Subproject commit 091437922f1baad2954527daa834131147be56c8 diff --git a/HerbSearch.jl b/HerbSearch.jl index d8d67c8..e2e6c5a 160000 --- a/HerbSearch.jl +++ b/HerbSearch.jl @@ -1 +1 @@ -Subproject commit d8d67c8f83985df536fc7fb853a8cd6032543aa8 +Subproject commit e2e6c5a62e23d5aaff95a181506f806931cb7021 diff --git a/HerbUtils.jl b/HerbUtils.jl deleted file mode 160000 index a4797de..0000000 --- a/HerbUtils.jl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a4797de5d133700872d0e8dfd152d6de57a6f571 diff --git a/Project.toml b/Project.toml index c54923a..6fcf2c5 100644 --- a/Project.toml +++ b/Project.toml @@ -2,3 +2,15 @@ name = "Herb" uuid = "c09c6b7f-4f63-49de-90d9-97a3563c0f4a" authors = ["Jaap de Jong "] 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" \ No newline at end of file diff --git a/README.md b/README.md index 1fe3bbd..ccc806b 100644 --- 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 index bbef1b1..66da706 100644 --- a/src/Herb.jl +++ b/src/Herb.jl @@ -1,11 +1,13 @@ 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 @@ -13,10 +15,11 @@ using .HerbEvaluation using .HerbSearch export + HerbCore, HerbGrammars, HerbConstraints, HerbData, HerbEvaluation, HerbSearch - + end # module \ No newline at end of file diff --git a/test/herb_test.jl b/test/herb_test.jl index beea8d0..38fb7a6 100644 --- 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 \ No newline at end of file