Changes

mi-erasmusmc · Jul 4, 2024 · b013171 · b013171
1 parent a0a00d6
commit b013171
Show file tree

Hide file tree

Showing 11 changed files with 4,877 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -47,7 +47,8 @@ output/
 
 # EXPLORE result files
 *.result
-inst/doc
+inst/cmake-build-debug
+inst/cmake-build-debug-coverage
 docs
 
 # PaRe Report

diff --git a/inst/CMakeLists.txt b/inst/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.17)
 project(Explore)
 
 set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_FLAGS "-Wall -Wextra -O3")
+# set(CMAKE_CXX_FLAGS "-Wall -Wextra -O3")
 set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Wextra -g")
 set(CMAKE_VERBOSE_MAKEFILE ON)
 

diff --git a/inst/examples/complexity/binary_10.project b/inst/examples/complexity/binary_10.project
@@ -46,5 +46,5 @@ Subsumption=no
 BranchBound=no
 Parallel=no
 ParallelMethod=ONE
-BinaryReduction=yes
+BinaryReduction=no
 
diff --git a/inst/examples/complexity/binary_3.project b/inst/examples/complexity/binary_3.project
@@ -8,7 +8,7 @@ IncrementalOutputFile=false
 [Setup]
 PartitionMethod=RESUBSTITUTION
 Randomize=no
-StartRulelength=3
+StartRulelength=1
 EndRulelength=3
 LearnRatio=0.8
 NumberofPartitions=1
@@ -36,7 +36,7 @@ PrintOperatorMethod=no
 PrintOperatorValues=no
 PrintCombinations=yes
 PrintFeatureSets=yes
-PrintCutoffSets=yes
+PrintCutoffSets=no
 PrintCutOffsetsBestLength=no
 PrintPerformance=yes
 PrintSets=no
@@ -46,5 +46,5 @@ Subsumption=no
 BranchBound=no
 Parallel=no
 ParallelMethod=ONE
-BinaryReduction=yes
+BinaryReduction=no
 
diff --git a/inst/examples/complexity/categorical_4.project b/inst/examples/complexity/categorical_4.project
@@ -8,8 +8,8 @@ IncrementalOutputFile=false
 [Setup]
 PartitionMethod=RESUBSTITUTION
 Randomize=no
-StartRulelength=3
-EndRulelength=3
+StartRulelength=2
+EndRulelength=2
 LearnRatio=0.8
 NumberofPartitions=1
 OperatorMethod=EXHAUSTIVE
@@ -35,7 +35,7 @@ PrintCutoffValues=no
 PrintOperatorMethod=no
 PrintOperatorValues=no
 PrintCombinations=yes
-PrintFeatureSets=no
+PrintFeatureSets=yes
 PrintCutoffSets=yes
 PrintCutOffsetsBestLength=no
 PrintPerformance=yes

diff --git a/inst/examples/complexity/continuous_4.project b/inst/examples/complexity/continuous_4.project
@@ -8,8 +8,8 @@ IncrementalOutputFile=false
 [Setup]
 PartitionMethod=RESUBSTITUTION
 Randomize=no
-StartRulelength=2
-EndRulelength=5
+StartRulelength=3
+EndRulelength=3
 LearnRatio=0.8
 NumberofPartitions=1
 OperatorMethod=EXHAUSTIVE
@@ -35,8 +35,8 @@ PrintCutoffValues=no
 PrintOperatorMethod=no
 PrintOperatorValues=no
 PrintCombinations=yes
-PrintFeatureSets=no
-PrintCutoffSets=no
+PrintFeatureSets=yes
+PrintCutoffSets=yes
 PrintCutOffsetsBestLength=no
 PrintPerformance=yes
 PrintSets=no