Merge pull request opencog#21 from Bitseat/restructure_moses_tests

Restructure moses/tests
behailu04 · Nov 2, 2018 · e19f2a4 · e19f2a4
2 parents 65c5ad8 + 6b7b959
commit e19f2a4
Show file tree

Hide file tree

Showing 42 changed files with 142 additions and 128 deletions.
diff --git a/tests/moses/CMakeLists.txt b/tests/moses/CMakeLists.txt
@@ -1,122 +1,8 @@
-#
-# Tests are listed and run in more-or-less dependency order:
-# Later tests assume earlier tests pass.
-#
 ADD_SUBDIRECTORY (scoring)
+ADD_SUBDIRECTORY (metapopulation)
+ADD_SUBDIRECTORY (moses)
+ADD_SUBDIRECTORY (optimization)
+ADD_SUBDIRECTORY (representation)
+ADD_SUBDIRECTORY (main)
 
-ADD_CXXTEST(iostream_scored_combo_treeUTest)
-TARGET_LINK_LIBRARIES(iostream_scored_combo_treeUTest
-	moses
-	ascombo
-	${COGUTIL_LIBRARY}
-)
 
-ADD_CXXTEST(KnobTurningUTest)
-TARGET_LINK_LIBRARIES(KnobTurningUTest
-	moses
-	ascombo
-	${COGUTIL_LIBRARY}
-)
-
-# requires boost::math; don't build if not found.
-IF(Boost_MATH_C99_FOUND)
-	ADD_CXXTEST(NeighborSamplingUTest)
-	TARGET_LINK_LIBRARIES(NeighborSamplingUTest
-		moses
-		ascombo
-		${COGUTIL_LIBRARY}
-	)
-ENDIF(Boost_MATH_C99_FOUND)
-
-
-ADD_CXXTEST(FieldSetUTest)
-TARGET_LINK_LIBRARIES(FieldSetUTest
-	moses
-	ascombo
-	${COGUTIL_LIBRARY}
-)
-
-ADD_CXXTEST(representationUTest)
-TARGET_LINK_LIBRARIES(representationUTest
-	moses
-	ascombo
-	${COGUTIL_LIBRARY}
-)
-
-ADD_CXXTEST(scoringUTest)
-TARGET_LINK_LIBRARIES(scoringUTest
-	moses
-	ascombo
-	${COGUTIL_LIBRARY}
-)
-
-ADD_CXXTEST(metapopulationUTest)
-TARGET_LINK_LIBRARIES(metapopulationUTest
-	moses
-	ascombo
-	${COGUTIL_LIBRARY}
-)
-
-ADD_CXXTEST(optimizationUTest)
-TARGET_LINK_LIBRARIES(optimizationUTest
-	moses
-	ascombo
-	${COGUTIL_LIBRARY}
-)
-
-ADD_CXXTEST(MOSESUTest)
-TARGET_LINK_LIBRARIES(MOSESUTest
-	asmoses_exec
-	moses
-	ascombo
-	${COGUTIL_LIBRARY}
-)
-
-ADD_CXXTEST(weightedUTest)
-TARGET_LINK_LIBRARIES(weightedUTest
-	asmoses_exec
-	moses
-	ascombo
-	${COGUTIL_LIBRARY}
-)
-
-ADD_CXXTEST(mixedUTest)
-TARGET_LINK_LIBRARIES(mixedUTest
-	asmoses_exec
-	moses
-	ascombo
-	${COGUTIL_LIBRARY}
-)
-
-ADD_CXXTEST(irisUTest)
-TARGET_LINK_LIBRARIES(irisUTest
-	asmoses_exec
-	moses
-	ascombo
-	${COGUTIL_LIBRARY}
-)
-
-ADD_CXXTEST(selectionUTest)
-TARGET_LINK_LIBRARIES(selectionUTest
-	asmoses_exec
-	moses
-	ascombo
-	${COGUTIL_LIBRARY}
-)
-
-ADD_CXXTEST(dynFeatSelUTest)
-TARGET_LINK_LIBRARIES(dynFeatSelUTest
-	asmoses_exec
-	moses
-	ascombo
-	${COGUTIL_LIBRARY}
-)
-
-ADD_CXXTEST(AntUTest)
-TARGET_LINK_LIBRARIES(AntUTest
-	ant_scoring
-	asmoses_exec
-	moses
-	ascombo
-	${COGUTIL_LIBRARY}
-)
diff --git a/tests/moses/main/CMakeLists.txt b/tests/moses/main/CMakeLists.txt
@@ -0,0 +1,52 @@
+#
+# Tests are listed and run in more-or-less dependency order:
+# Later tests assume earlier tests pass.
+#
+ADD_CXXTEST(MOSESUTest)
+TARGET_LINK_LIBRARIES(MOSESUTest
+        asmoses_exec
+        moses
+        ascombo
+        ${COGUTIL_LIBRARY}
+        )
+
+ADD_CXXTEST(mixedUTest)
+TARGET_LINK_LIBRARIES(mixedUTest
+        asmoses_exec
+        moses
+        ascombo
+        ${COGUTIL_LIBRARY}
+        )
+
+ADD_CXXTEST(irisUTest)
+TARGET_LINK_LIBRARIES(irisUTest
+        asmoses_exec
+        moses
+        ascombo
+        ${COGUTIL_LIBRARY}
+        )
+
+ADD_CXXTEST(selectionUTest)
+TARGET_LINK_LIBRARIES(selectionUTest
+        asmoses_exec
+        moses
+        ascombo
+        ${COGUTIL_LIBRARY}
+        )
+
+ADD_CXXTEST(dynFeatSelUTest)
+TARGET_LINK_LIBRARIES(dynFeatSelUTest
+        asmoses_exec
+        moses
+        ascombo
+        ${COGUTIL_LIBRARY}
+        )
+
+ADD_CXXTEST(weightedUTest)
+TARGET_LINK_LIBRARIES(weightedUTest
+        asmoses_exec
+        moses
+        ascombo
+        ${COGUTIL_LIBRARY}
+        )
+
diff --git a/tests/moses/IrisSetosa.data → tests/moses/main/IrisSetosa.data b/tests/moses/IrisSetosa.data → tests/moses/main/IrisSetosa.data
diff --git a/tests/moses/KL_test.csv → tests/moses/main/KL_test.csv b/tests/moses/KL_test.csv → tests/moses/main/KL_test.csv
diff --git a/tests/moses/MOSESUTest.cxxtest → tests/moses/main/MOSESUTest.cxxtest b/tests/moses/MOSESUTest.cxxtest → tests/moses/main/MOSESUTest.cxxtest
@@ -28,7 +28,7 @@
 
 using namespace opencog::moses;
 
-const string MOSESUTest_dir = string(PROJECT_SOURCE_DIR) + "/tests/moses/";
+const string MOSESUTest_dir = string(PROJECT_SOURCE_DIR) + "/tests/moses/main/";
 
 /**
  * MOSES test on toy problems

diff --git a/tests/moses/contin_precision.csv → tests/moses/main/contin_precision.csv b/tests/moses/contin_precision.csv → tests/moses/main/contin_precision.csv
diff --git a/tests/moses/dataset.csv → tests/moses/main/dataset.csv b/tests/moses/dataset.csv → tests/moses/main/dataset.csv
diff --git a/tests/moses/dynFeatSelUTest.cxxtest → tests/moses/main/dynFeatSelUTest.cxxtest b/tests/moses/dynFeatSelUTest.cxxtest → tests/moses/main/dynFeatSelUTest.cxxtest
@@ -23,11 +23,11 @@
 
 #include <cxxtest/TestSuite.h>
 #include <opencog/util/mt19937ar.h>
-#include "moses-framework.h"
+#include "tests/moses/main/moses-framework.h"
 
 using namespace opencog::moses;
 
-const string test_dir = string(PROJECT_SOURCE_DIR) + "/tests/moses/";
+const string test_dir = string(PROJECT_SOURCE_DIR) + "/tests/moses/main/";
 
 /**
  * Test operation of the dynamic feature selector.

diff --git a/tests/moses/feat-sel.csv → tests/moses/main/feat-sel.csv b/tests/moses/feat-sel.csv → tests/moses/main/feat-sel.csv
diff --git a/tests/moses/iris.data → tests/moses/main/iris.data b/tests/moses/iris.data → tests/moses/main/iris.data
diff --git a/tests/moses/irisUTest.cxxtest → tests/moses/main/irisUTest.cxxtest b/tests/moses/irisUTest.cxxtest → tests/moses/main/irisUTest.cxxtest
@@ -25,7 +25,7 @@
 
 using namespace opencog::moses;
 
-const string mixedUTest_dir = string(PROJECT_SOURCE_DIR) + "/tests/moses/";
+const string mixedUTest_dir = string(PROJECT_SOURCE_DIR) + "/tests/moses/main/";
 
 /**
  * Test learning of problems that require a mixture of boolean

diff --git a/tests/moses/mixedUTest.cxxtest → tests/moses/main/mixedUTest.cxxtest b/tests/moses/mixedUTest.cxxtest → tests/moses/main/mixedUTest.cxxtest
@@ -25,7 +25,7 @@
 
 using namespace opencog::moses;
 
-const string mixedUTest_dir = string(PROJECT_SOURCE_DIR) + "/tests/moses/";
+const string mixedUTest_dir = string(PROJECT_SOURCE_DIR) + "/tests/moses/main/";
 
 /**
  * Test learning of problems that require a mixture of boolean

diff --git a/tests/moses/moses-framework.h → tests/moses/main/moses-framework.h b/tests/moses/moses-framework.h → tests/moses/main/moses-framework.h
diff --git a/tests/moses/precision.csv → tests/moses/main/precision.csv b/tests/moses/precision.csv → tests/moses/main/precision.csv
diff --git a/tests/moses/precision2.ctable → tests/moses/main/precision2.ctable b/tests/moses/precision2.ctable → tests/moses/main/precision2.ctable
diff --git a/tests/moses/predicates-1.3.csv → tests/moses/main/predicates-1.3.csv b/tests/moses/predicates-1.3.csv → tests/moses/main/predicates-1.3.csv
diff --git a/tests/moses/predicates.csv → tests/moses/main/predicates.csv b/tests/moses/predicates.csv → tests/moses/main/predicates.csv
diff --git a/tests/moses/preselect-less-dupe.csv → tests/moses/main/preselect-less-dupe.csv b/tests/moses/preselect-less-dupe.csv → tests/moses/main/preselect-less-dupe.csv
diff --git a/tests/moses/preselect-no-dupe.csv → tests/moses/main/preselect-no-dupe.csv b/tests/moses/preselect-no-dupe.csv → tests/moses/main/preselect-no-dupe.csv
diff --git a/tests/moses/preselect.csv → tests/moses/main/preselect.csv b/tests/moses/preselect.csv → tests/moses/main/preselect.csv
diff --git a/tests/moses/select-less-dupe.csv → tests/moses/main/select-less-dupe.csv b/tests/moses/select-less-dupe.csv → tests/moses/main/select-less-dupe.csv
diff --git a/tests/moses/select-no-dupe.csv → tests/moses/main/select-no-dupe.csv b/tests/moses/select-no-dupe.csv → tests/moses/main/select-no-dupe.csv
diff --git a/tests/moses/select.csv → tests/moses/main/select.csv b/tests/moses/select.csv → tests/moses/main/select.csv
diff --git a/tests/moses/selectionUTest.cxxtest → tests/moses/main/selectionUTest.cxxtest b/tests/moses/selectionUTest.cxxtest → tests/moses/main/selectionUTest.cxxtest
@@ -30,7 +30,7 @@
 
 using namespace opencog::moses;
 
-const string test_dir = string(PROJECT_SOURCE_DIR) + "/tests/moses/";
+const string test_dir = string(PROJECT_SOURCE_DIR) + "/tests/moses/main/";
 
 /**
  * Test of the selection scorer

diff --git a/tests/moses/weight-neg.csv → tests/moses/main/weight-neg.csv b/tests/moses/weight-neg.csv → tests/moses/main/weight-neg.csv
diff --git a/tests/moses/weighted.csv → tests/moses/main/weighted.csv b/tests/moses/weighted.csv → tests/moses/main/weighted.csv
diff --git a/tests/moses/weightedUTest.cxxtest → tests/moses/main/weightedUTest.cxxtest b/tests/moses/weightedUTest.cxxtest → tests/moses/main/weightedUTest.cxxtest
@@ -22,11 +22,11 @@
  */
 
 #include <cxxtest/TestSuite.h>
-#include "moses-framework.h"
+#include "tests/moses/main/moses-framework.h"
 
 using namespace opencog::moses;
 
-const string weightedUTest_dir = string(PROJECT_SOURCE_DIR) + "/tests/moses/";
+const string weightedUTest_dir = string(PROJECT_SOURCE_DIR) + "/tests/moses/main/";
 
 /**
  * Test learning of problems that require a weieghted score

diff --git a/tests/moses/metapopulation/CMakeLists.txt b/tests/moses/metapopulation/CMakeLists.txt
@@ -0,0 +1,6 @@
+ADD_CXXTEST(metapopulationUTest)
+TARGET_LINK_LIBRARIES(metapopulationUTest
+        moses
+        ascombo
+        ${COGUTIL_LIBRARY}
+        )
diff --git a/tests/moses/metapopulationUTest.cxxtest → ...etapopulation/metapopulationUTest.cxxtest b/tests/moses/metapopulationUTest.cxxtest → ...etapopulation/metapopulationUTest.cxxtest
diff --git a/tests/moses/AntUTest.cxxtest → tests/moses/moses/AntUTest.cxxtest b/tests/moses/AntUTest.cxxtest → tests/moses/moses/AntUTest.cxxtest
diff --git a/tests/moses/moses/CMakeLists.txt b/tests/moses/moses/CMakeLists.txt
@@ -0,0 +1,25 @@
+# requires boost::math; don't build if not found.
+IF(Boost_MATH_C99_FOUND)
+    ADD_CXXTEST(NeighborSamplingUTest)
+    TARGET_LINK_LIBRARIES(NeighborSamplingUTest
+            moses
+            ascombo
+            ${COGUTIL_LIBRARY}
+            )
+ENDIF(Boost_MATH_C99_FOUND)
+
+ADD_CXXTEST(AntUTest)
+TARGET_LINK_LIBRARIES(AntUTest
+        ant_scoring
+        asmoses_exec
+        moses
+        ascombo
+        ${COGUTIL_LIBRARY}
+        )
+
+ADD_CXXTEST(iostream_scored_combo_treeUTest)
+TARGET_LINK_LIBRARIES(iostream_scored_combo_treeUTest
+        moses
+        ascombo
+        ${COGUTIL_LIBRARY}
+        )
diff --git a/tests/moses/NeighborSamplingUTest.cxxtest → ...moses/moses/NeighborSamplingUTest.cxxtest b/tests/moses/NeighborSamplingUTest.cxxtest → ...moses/moses/NeighborSamplingUTest.cxxtest
diff --git a/...s/iostream_scored_combo_treeUTest.cxxtest → ...s/iostream_scored_combo_treeUTest.cxxtest b/...s/iostream_scored_combo_treeUTest.cxxtest → ...s/iostream_scored_combo_treeUTest.cxxtest
diff --git a/tests/moses/optimization/CMakeLists.txt b/tests/moses/optimization/CMakeLists.txt
@@ -0,0 +1,6 @@
+ADD_CXXTEST(optimizationUTest)
+TARGET_LINK_LIBRARIES(optimizationUTest
+        moses
+        ascombo
+        ${COGUTIL_LIBRARY}
+        )
diff --git a/tests/moses/optimizationUTest.cxxtest → ...es/optimization/optimizationUTest.cxxtest b/tests/moses/optimizationUTest.cxxtest → ...es/optimization/optimizationUTest.cxxtest
diff --git a/tests/moses/representation/CMakeLists.txt b/tests/moses/representation/CMakeLists.txt
@@ -0,0 +1,19 @@
+ADD_CXXTEST(representationUTest)
+TARGET_LINK_LIBRARIES(representationUTest
+        moses
+        ascombo
+        ${COGUTIL_LIBRARY}
+        )
+
+ADD_CXXTEST(KnobTurningUTest)
+TARGET_LINK_LIBRARIES(KnobTurningUTest
+        moses
+        ascombo
+        ${COGUTIL_LIBRARY}
+        )
+ADD_CXXTEST(FieldSetUTest)
+TARGET_LINK_LIBRARIES(FieldSetUTest
+        moses
+        ascombo
+        ${COGUTIL_LIBRARY}
+        )
diff --git a/tests/moses/FieldSetUTest.cxxtest → ...oses/representation/FieldSetUTest.cxxtest b/tests/moses/FieldSetUTest.cxxtest → ...oses/representation/FieldSetUTest.cxxtest
diff --git a/tests/moses/KnobTurningUTest.cxxtest → ...s/representation/KnobTurningUTest.cxxtest b/tests/moses/KnobTurningUTest.cxxtest → ...s/representation/KnobTurningUTest.cxxtest
diff --git a/tests/moses/representationUTest.cxxtest → ...epresentation/representationUTest.cxxtest b/tests/moses/representationUTest.cxxtest → ...epresentation/representationUTest.cxxtest
diff --git a/tests/moses/scoring/CMakeLists.txt b/tests/moses/scoring/CMakeLists.txt
@@ -1,3 +1,10 @@
+ADD_CXXTEST(scoringUTest)
+TARGET_LINK_LIBRARIES(scoringUTest
+        moses
+        ascombo
+        ${COGUTIL_LIBRARY}
+        )
+
 ADD_CXXTEST(atomese_LBS_UTest)
 TARGET_LINK_LIBRARIES(atomese_LBS_UTest
         moses

diff --git a/tests/moses/scoring/precision.csv b/tests/moses/scoring/precision.csv
@@ -0,0 +1,13 @@
+# v2 is great at maximizing the precision of the target, while v1 is
+# great at maximizing the negative predictive value of the target
+target,v1,v2
+0,0,0
+0,1,0
+0,0,0
+0,1,0
+0,1,0
+1,0,0
+1,0,0
+1,0,1
+1,0,1
+1,0,1
diff --git a/tests/moses/scoringUTest.cxxtest → tests/moses/scoring/scoringUTest.cxxtest b/tests/moses/scoringUTest.cxxtest → tests/moses/scoring/scoringUTest.cxxtest
@@ -32,7 +32,7 @@ using namespace combo;
 using namespace moses;
 using namespace std;
 
-const string mosesUTest_dir=string(PROJECT_SOURCE_DIR) + "/tests/moses/";
+const string mosesUTest_dir=string(PROJECT_SOURCE_DIR) + "/tests/moses/main/";
 const string target_feature = "target";
 
 class scoringUTest : public CxxTest::TestSuite