Merge pull request #5 from maxreiss123/develop

maxreiss123 · web-flow · commit 8bd23353a52b · 2024-10-26T11:00:55.000+11:00
Develop
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,8 @@
-name = "JGep"
+name = "JGepRegression"
 uuid = "2f0a5bb0-5f4f-4f7f-b515-93a1e67611af"
 authors = ["Max Reissmann <reissmannm@student.unimelb.edu.au>"]
-version = "0.3.0"
+version = "0.3.1"
+
 
 [deps]
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
@@ -26,7 +27,3 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
-
-[compat]
-Printf = "1.11.0"
-Test = "1.11.0"
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ The repository contains the implementation of the Gene Expression Programming[1]
   ```
     julia --project=.
     using Pkg
-    Pkg.add(url="https://github.com/maxreiss123/GEP_SBP_.git")
+    Pkg.add("JGep")
   ```
 
 
@@ -45,3 +45,4 @@ The repository contains the implementation of the Gene Expression Programming[1]
 - [ ] Documentation 
 - [ ] Re-write postprocessing
 - [ ] Improve usability for user interaction
+- [ ] Next operations: Tail flip, Connection symbol flip, wrapper class for easy usage, config class for predefinition, staggered exploration
diff --git a/src/JGepRegression.jl b/src/JGepRegression.jl
@@ -1,4 +1,4 @@
-module JGep
+module JGepRegression
 
 include("Entities.jl")
 include("Gep.jl")
@@ -48,4 +48,4 @@ export generate_gene, generate_preamle!, compile_expression!, generate_chromosom
 export genetic_operations!
 
 
-end
+end
diff --git a/test/Main_min_example.jl b/test/Main_min_example.jl
@@ -1,6 +1,6 @@
-include("../src/JGep.jl")
+include("../src/JGepRegression.jl")
 
-using .JGep
+using .JGepRegression
 using DynamicExpressions
 using OrderedCollections
 using BenchmarkTools
diff --git a/test/Main_min_with_csv.jl b/test/Main_min_with_csv.jl
@@ -1,4 +1,4 @@
-using JGep
+using JGepRegression
 using DynamicExpressions
 using OrderedCollections
 using BenchmarkTools
diff --git a/test/Main_min_with_csv_and_units.jl b/test/Main_min_with_csv_and_units.jl
@@ -1,4 +1,4 @@
-using JGep
+using JGepRegression
 using DynamicExpressions
 using OrderedCollections
 using BenchmarkTools
diff --git a/test/Spb_core_test.jl b/test/Spb_core_test.jl
@@ -234,4 +234,4 @@ end
         dim6 = calculate_vector_dimension!(tree6)
         @test dim6 == [1.0, 1.0, 0.0, 0.0]  # Should return existing dimension without recalculation    
     end
-end
+end
diff --git a/test/non_dom_sort_test.jl b/test/non_dom_sort_test.jl
diff --git a/test/paper_test.jl b/test/paper_test.jl
@@ -1,4 +1,4 @@
-using JGep
+using JGepRegression
 using DynamicExpressions
 using OrderedCollections
 using CSV 
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,2 +1,3 @@
 include("Entity_test.jl")
-include("Spb_core.jl")
+include("Spb_core_test.jl")
+include("non_dom_sort_test.jl")
diff --git a/tutorial/JGEP_CSV_demo.ipynb b/tutorial/JGEP_CSV_demo.ipynb
diff --git a/tutorial/JGEP_demo.ipynb b/tutorial/JGEP_demo.ipynb

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using JGep`
	`1`	`+using JGepRegression`
`2`	`2`	`using DynamicExpressions`
`3`	`3`	`using OrderedCollections`
`4`	`4`	`using BenchmarkTools`