Merge branch 'dev' of https://github.com/aclai-lab/SoleModels.jl into…

… dev
aclai-lab · Oct 26, 2024 · e148b87 · e148b87
2 parents 20c2932 + ebf56b8
commit e148b87
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/test/base.jl b/test/base.jl
@@ -9,14 +9,16 @@ using Test
 
 io = IOBuffer()
 
+parse_other_kind_of_formula = SoleLogics.parseformula
+
 p = SoleLogics.parseformula("p")
 phi = SoleLogics.parseformula("p∧q∨r")
-phi2 = SoleLogics.parsebaseformula("q∧s→r")
+phi2 = parse_other_kind_of_formula("q∧s→r")
 
-formula_p = SoleLogics.parsebaseformula("p")
-formula_q = SoleLogics.parsebaseformula("q")
-formula_r = SoleLogics.parsebaseformula("r")
-formula_s = SoleLogics.parsebaseformula("s")
+formula_p = parse_other_kind_of_formula("p")
+formula_q = parse_other_kind_of_formula("q")
+formula_r = parse_other_kind_of_formula("r")
+formula_s = parse_other_kind_of_formula("s")
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Leaf models ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/test/misc.jl b/test/misc.jl
@@ -11,6 +11,9 @@ using SoleModels: listrules, displaymodel, submodels
 
 io = IOBuffer()
 
+# parse_other_kind_of_formula = SoleLogics.parsebaseformula
+parse_other_kind_of_formula = SoleLogics.parseformula
+
 ################################### LeafModel #############################################
 outcome_int =  @test_nowarn ConstantModel(2)
 outcome_float = @test_nowarn ConstantModel(1.5)
@@ -65,26 +68,26 @@ st_1 = @test_nowarn SyntaxTree(prop_1)
 st_100 = @test_nowarn SyntaxTree(prop_100)
 
 ################################### Formulas ###############################################
-p = @test_nowarn SoleLogics.parsebaseformula("p")
+p = @test_nowarn parse_other_kind_of_formula("p")
 p_tree = @test_nowarn SoleLogics.parseformula("p")
 
-# phi = @test_nowarn SoleLogics.parsebaseformula("p∧q∨r")
+# phi = @test_nowarn parse_other_kind_of_formula("p∧q∨r")
 # phi_tree = @test_nowarn SoleLogics.parseformula("p∧q∨r")
 
-# phi2 = @test_nowarn SoleLogics.parsebaseformula("q∧s→r")
+# phi2 = @test_nowarn parse_other_kind_of_formula("q∧s→r")
 # phi2_tree = @test_nowarn SoleLogics.parseformula("q∧s→r")
 
 
-phi = @test_nowarn SoleLogics.parsebaseformula("p∧q∨r")
+phi = @test_nowarn parse_other_kind_of_formula("p∧q∨r")
 phi_tree = @test_nowarn SoleLogics.parseformula("p∧q∨r")
 
-phi2 = @test_nowarn SoleLogics.parsebaseformula("q∧s→r")
+phi2 = @test_nowarn parse_other_kind_of_formula("q∧s→r")
 phi2_tree = @test_nowarn SoleLogics.parseformula("q∧s→r")
 
-formula_p = @test_nowarn SoleLogics.parsebaseformula("p")
-formula_q = @test_nowarn SoleLogics.parsebaseformula("q")
-formula_r = @test_nowarn SoleLogics.parsebaseformula("r")
-formula_s = @test_nowarn SoleLogics.parsebaseformula("s")
+formula_p = @test_nowarn parse_other_kind_of_formula("p")
+formula_q = @test_nowarn parse_other_kind_of_formula("q")
+formula_r = @test_nowarn parse_other_kind_of_formula("r")
+formula_s = @test_nowarn parse_other_kind_of_formula("s")
 
 ############################### SyntaxTree ######################################
 st_not_r = @test_nowarn ¬st_r