diff --git a/.cproject b/.cproject index 54f296c33..efdaf0c8a 100644 --- a/.cproject +++ b/.cproject @@ -311,14 +311,6 @@ true true - - make - -j2 - testGaussianFactor.run - true - true - true - make -j2 @@ -345,6 +337,7 @@ make + tests/testBayesTree.run true false @@ -352,6 +345,7 @@ make + testBinaryBayesNet.run true false @@ -399,6 +393,7 @@ make + testSymbolicBayesNet.run true false @@ -406,6 +401,7 @@ make + tests/testSymbolicFactor.run true false @@ -413,6 +409,7 @@ make + testSymbolicFactorGraph.run true false @@ -428,11 +425,20 @@ make + tests/testBayesTree true false true + + make + -j2 + testGaussianFactor.run + true + true + true + make -j2 @@ -459,7 +465,6 @@ make - testGraph.run true false @@ -531,7 +536,6 @@ make - testInference.run true false @@ -539,7 +543,6 @@ make - testGaussianFactor.run true false @@ -547,7 +550,6 @@ make - testJunctionTree.run true false @@ -555,7 +557,6 @@ make - testSymbolicBayesNet.run true false @@ -563,7 +564,6 @@ make - testSymbolicFactorGraph.run true false @@ -593,6 +593,38 @@ true true + + make + -j5 + testBTree.run + true + true + true + + + make + -j5 + testDSF.run + true + true + true + + + make + -j5 + testDSFVector.run + true + true + true + + + make + -j5 + testFixedVector.run + true + true + true + make -j2 @@ -633,22 +665,6 @@ false true - - make - -j2 - all - true - true - true - - - make - -j2 - clean - true - true - true - make -j2 @@ -665,6 +681,22 @@ true true + + make + -j2 + all + true + true + true + + + make + -j2 + clean + true + true + true + make -j2 @@ -689,18 +721,26 @@ true true - + make - -j5 - nonlinear.testValues.run + -j2 + all true true true - + make - -j5 - nonlinear.testOrdering.run + -j2 + check + true + true + true + + + make + -j2 + clean true true true @@ -737,26 +777,58 @@ true true - + make - -j2 - all + -j5 + testValues.run true true true - + make - -j2 - check + -j5 + testOrdering.run true true true - + make - -j2 - clean + -j5 + schedulingExample.run + true + true + true + + + make + -j5 + testCSP.run + true + true + true + + + make + -j5 + testScheduler.run + true + true + true + + + make + -j5 + schedulingQuals12.run + true + true + true + + + make + -j5 + testSudoku.run true true true @@ -793,10 +865,10 @@ true true - + make -j5 - check + testDiscreteFactor.run true true true @@ -1067,6 +1139,7 @@ make + testErrors.run true false @@ -1522,7 +1595,6 @@ make - testSimulated2DOriented.run true false @@ -1562,7 +1634,6 @@ make - testSimulated2D.run true false @@ -1570,7 +1641,6 @@ make - testSimulated3D.run true false @@ -1592,82 +1662,74 @@ true true - - make - -j2 - tests/testVectorValues.run - true - true - true - - + make -j5 - linear.testNoiseModel.run + testVectorValues.run true true true - - make - -j2 - tests/testGaussianFactor.run - true - true - true - - - make - -j2 - tests/testHessianFactor.run - true - true - true - - - make - -j2 - tests/testGaussianConditional.run - true - true - true - - - make - -j2 - tests/testGaussianFactorGraph.run - true - true - true - - - make - -j2 - tests/testGaussianJunctionTree.run - true - true - true - - - make - -j2 - tests/testKalmanFilter.run - true - true - true - - - make - -j2 - tests/testGaussianDensity.run - true - true - true - - + make -j5 - linear.testSerializationLinear.run + testNoiseModel.run + true + true + true + + + make + -j5 + testHessianFactor.run + true + true + true + + + make + -j5 + testGaussianConditional.run + true + true + true + + + make + -j5 + testGaussianFactorGraph.run + true + true + true + + + make + -j5 + testGaussianJunctionTree.run + true + true + true + + + make + -j5 + testKalmanFilter.run + true + true + true + + + make + -j5 + testGaussianDensity.run + true + true + true + + + make + -j5 + testSerializationLinear.run true true true @@ -1770,7 +1832,6 @@ make - tests/testGaussianISAM2 true false @@ -1792,102 +1853,6 @@ true true - - make - -j2 - testRot3.run - true - true - true - - - make - -j2 - testRot2.run - true - true - true - - - make - -j2 - testPose3.run - true - true - true - - - make - -j2 - timeRot3.run - true - true - true - - - make - -j2 - testPose2.run - true - true - true - - - make - -j2 - testCal3_S2.run - true - true - true - - - make - -j2 - testSimpleCamera.run - true - true - true - - - make - -j2 - testHomography2.run - true - true - true - - - make - -j2 - testCalibratedCamera.run - true - true - true - - - make - -j2 - check - true - true - true - - - make - -j2 - clean - true - true - true - - - make - -j2 - testPoint2.run - true - true - true - make -j2 @@ -2089,6 +2054,7 @@ cpack + -G DEB true false @@ -2096,6 +2062,7 @@ cpack + -G RPM true false @@ -2103,6 +2070,7 @@ cpack + -G TGZ true false @@ -2110,6 +2078,7 @@ cpack + --config CPackSourceConfig.cmake true false @@ -2123,82 +2092,98 @@ true true - + make - -j5 - wrap_gtsam_unstable + -j2 + testRot3.run true true true - + make - -j5 - check.wrap + -j2 + testRot2.run true true true - + make - -j5 - check.dynamics_unstable + -j2 + testPose3.run true true true - + make - -j5 - check.slam_unstable + -j2 + timeRot3.run true true true - + make - -j5 - check.base_unstable + -j2 + testPose2.run true true true - + make - -j5 - testSpirit.run + -j2 + testCal3_S2.run true true true - + make - -j5 - testWrap.run + -j2 + testSimpleCamera.run true true true - + make - -j5 - check.wrap + -j2 + testHomography2.run true true true - + make - -j5 - wrap_gtsam + -j2 + testCalibratedCamera.run true true true - + make - -j5 - wrap + -j2 + check + true + true + true + + + make + -j2 + clean + true + true + true + + + make + -j2 + testPoint2.run true true true @@ -2242,6 +2227,46 @@ false true + + make + -j5 + wrap.testSpirit.run + true + true + true + + + make + -j5 + wrap.testWrap.run + true + true + true + + + make + -j5 + check.wrap + true + true + true + + + make + -j5 + wrap_gtsam + true + true + true + + + make + -j5 + wrap + true + true + true + diff --git a/gtsam/discrete/CMakeLists.txt b/gtsam/discrete/CMakeLists.txt index d45340990..243359855 100644 --- a/gtsam/discrete/CMakeLists.txt +++ b/gtsam/discrete/CMakeLists.txt @@ -23,14 +23,6 @@ if (GTSAM_BUILD_TESTS) gtsam_add_subdir_tests(discrete "${discrete_local_libs}" "gtsam-static" "${discrete_excluded_tests}") endif() -# add examples -foreach(example schedulingExample schedulingQuals12) - add_executable(${example} "examples/${example}.cpp") - add_dependencies(${example} gtsam-static) - target_link_libraries(${example} gtsam-static) - add_custom_target(${example}.run ${EXECUTABLE_OUTPUT_PATH}${example} ${ARGN}) -endforeach(example) - # Build timing scripts #if (GTSAM_BUILD_TIMING) # gtsam_add_timing(discrete "${discrete_local_libs}") diff --git a/gtsam_unstable/CMakeLists.txt b/gtsam_unstable/CMakeLists.txt index 9e1daf24b..f7563f8ff 100644 --- a/gtsam_unstable/CMakeLists.txt +++ b/gtsam_unstable/CMakeLists.txt @@ -2,6 +2,7 @@ # and also build tests set (gtsam_unstable_subdirs base + discrete dynamics slam ) diff --git a/gtsam/discrete/AllDiff.cpp b/gtsam_unstable/discrete/AllDiff.cpp similarity index 97% rename from gtsam/discrete/AllDiff.cpp rename to gtsam_unstable/discrete/AllDiff.cpp index 064e0d1c8..261787691 100644 --- a/gtsam/discrete/AllDiff.cpp +++ b/gtsam_unstable/discrete/AllDiff.cpp @@ -5,8 +5,8 @@ * @author Frank Dellaert */ -#include -#include +#include +#include #include #include diff --git a/gtsam/discrete/AllDiff.h b/gtsam_unstable/discrete/AllDiff.h similarity index 97% rename from gtsam/discrete/AllDiff.h rename to gtsam_unstable/discrete/AllDiff.h index 846dc335b..b90a4b06e 100644 --- a/gtsam/discrete/AllDiff.h +++ b/gtsam_unstable/discrete/AllDiff.h @@ -7,8 +7,8 @@ #pragma once +#include #include -#include namespace gtsam { diff --git a/gtsam/discrete/BinaryAllDiff.h b/gtsam_unstable/discrete/BinaryAllDiff.h similarity index 100% rename from gtsam/discrete/BinaryAllDiff.h rename to gtsam_unstable/discrete/BinaryAllDiff.h diff --git a/gtsam_unstable/discrete/CMakeLists.txt b/gtsam_unstable/discrete/CMakeLists.txt new file mode 100644 index 000000000..73f10f1f0 --- /dev/null +++ b/gtsam_unstable/discrete/CMakeLists.txt @@ -0,0 +1,31 @@ +# Install headers +file(GLOB discrete_headers "*.h") +install(FILES ${discrete_headers} DESTINATION include/gtsam_unstable/discrete) + +# Components to link tests in this subfolder against +set(discrete_local_libs + discrete_unstable + discrete + inference + base + ccolamd +) + +set (discrete_full_libs + gtsam-static + gtsam_unstable-static) + +# Exclude tests that don't work +set (discrete_excluded_tests "") + +# Add all tests +gtsam_add_subdir_tests(discrete_unstable "${discrete_local_libs}" "${discrete_full_libs}" "${discrete_excluded_tests}") + +# add examples +foreach(example schedulingExample schedulingQuals12) + add_executable(${example} "examples/${example}.cpp") + add_dependencies(${example} gtsam-static) + target_link_libraries(${example} gtsam-static) + add_custom_target(${example}.run ${EXECUTABLE_OUTPUT_PATH}${example} ${ARGN}) +endforeach(example) + diff --git a/gtsam/discrete/CSP.cpp b/gtsam_unstable/discrete/CSP.cpp similarity index 96% rename from gtsam/discrete/CSP.cpp rename to gtsam_unstable/discrete/CSP.cpp index c0d57f320..ebc56441c 100644 --- a/gtsam/discrete/CSP.cpp +++ b/gtsam_unstable/discrete/CSP.cpp @@ -5,8 +5,8 @@ * @author Frank Dellaert */ -#include -#include +#include +#include #include #include #include diff --git a/gtsam/discrete/CSP.h b/gtsam_unstable/discrete/CSP.h similarity index 95% rename from gtsam/discrete/CSP.h rename to gtsam_unstable/discrete/CSP.h index d423426fd..517ee6796 100644 --- a/gtsam/discrete/CSP.h +++ b/gtsam_unstable/discrete/CSP.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include #include namespace gtsam { diff --git a/gtsam/discrete/Domain.cpp b/gtsam_unstable/discrete/Domain.cpp similarity index 98% rename from gtsam/discrete/Domain.cpp rename to gtsam_unstable/discrete/Domain.cpp index 130bd71ff..c8dbdb4e7 100644 --- a/gtsam/discrete/Domain.cpp +++ b/gtsam_unstable/discrete/Domain.cpp @@ -5,7 +5,7 @@ * @author Frank Dellaert */ -#include +#include #include #include #include diff --git a/gtsam/discrete/Domain.h b/gtsam_unstable/discrete/Domain.h similarity index 100% rename from gtsam/discrete/Domain.h rename to gtsam_unstable/discrete/Domain.h diff --git a/gtsam/discrete/Scheduler.cpp b/gtsam_unstable/discrete/Scheduler.cpp similarity index 99% rename from gtsam/discrete/Scheduler.cpp rename to gtsam_unstable/discrete/Scheduler.cpp index dd578930d..a586e7f33 100644 --- a/gtsam/discrete/Scheduler.cpp +++ b/gtsam_unstable/discrete/Scheduler.cpp @@ -5,7 +5,7 @@ * @author Frank Dellaert */ -#include +#include #include #include #include diff --git a/gtsam/discrete/Scheduler.h b/gtsam_unstable/discrete/Scheduler.h similarity index 99% rename from gtsam/discrete/Scheduler.h rename to gtsam_unstable/discrete/Scheduler.h index f01b1591e..e44f703b2 100644 --- a/gtsam/discrete/Scheduler.h +++ b/gtsam_unstable/discrete/Scheduler.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace gtsam { diff --git a/gtsam/discrete/SingleValue.cpp b/gtsam_unstable/discrete/SingleValue.cpp similarity index 96% rename from gtsam/discrete/SingleValue.cpp rename to gtsam_unstable/discrete/SingleValue.cpp index 8d5fd0d8d..cfa2089fc 100644 --- a/gtsam/discrete/SingleValue.cpp +++ b/gtsam_unstable/discrete/SingleValue.cpp @@ -5,8 +5,8 @@ * @author Frank Dellaert */ -#include -#include +#include +#include #include #include #include diff --git a/gtsam/discrete/SingleValue.h b/gtsam_unstable/discrete/SingleValue.h similarity index 100% rename from gtsam/discrete/SingleValue.h rename to gtsam_unstable/discrete/SingleValue.h diff --git a/gtsam/discrete/examples/Doodle.csv b/gtsam_unstable/discrete/examples/Doodle.csv similarity index 100% rename from gtsam/discrete/examples/Doodle.csv rename to gtsam_unstable/discrete/examples/Doodle.csv diff --git a/gtsam/discrete/examples/Doodle.xls b/gtsam_unstable/discrete/examples/Doodle.xls similarity index 100% rename from gtsam/discrete/examples/Doodle.xls rename to gtsam_unstable/discrete/examples/Doodle.xls diff --git a/gtsam/discrete/examples/Doodle2012.csv b/gtsam_unstable/discrete/examples/Doodle2012.csv similarity index 100% rename from gtsam/discrete/examples/Doodle2012.csv rename to gtsam_unstable/discrete/examples/Doodle2012.csv diff --git a/gtsam/discrete/examples/Doodle2012.xls b/gtsam_unstable/discrete/examples/Doodle2012.xls similarity index 100% rename from gtsam/discrete/examples/Doodle2012.xls rename to gtsam_unstable/discrete/examples/Doodle2012.xls diff --git a/gtsam/discrete/examples/intrusive.xlsx b/gtsam_unstable/discrete/examples/intrusive.xlsx similarity index 100% rename from gtsam/discrete/examples/intrusive.xlsx rename to gtsam_unstable/discrete/examples/intrusive.xlsx diff --git a/gtsam/discrete/examples/schedulingExample.cpp b/gtsam_unstable/discrete/examples/schedulingExample.cpp similarity index 99% rename from gtsam/discrete/examples/schedulingExample.cpp rename to gtsam_unstable/discrete/examples/schedulingExample.cpp index ff3f8a26f..6ad2478ec 100644 --- a/gtsam/discrete/examples/schedulingExample.cpp +++ b/gtsam_unstable/discrete/examples/schedulingExample.cpp @@ -8,7 +8,7 @@ //#define ENABLE_TIMING #define ADD_NO_CACHING #define ADD_NO_PRUNING -#include +#include #include #include diff --git a/gtsam/discrete/examples/schedulingQuals12.cpp b/gtsam_unstable/discrete/examples/schedulingQuals12.cpp similarity index 99% rename from gtsam/discrete/examples/schedulingQuals12.cpp rename to gtsam_unstable/discrete/examples/schedulingQuals12.cpp index 7571fbc58..32bb8ebb2 100644 --- a/gtsam/discrete/examples/schedulingQuals12.cpp +++ b/gtsam_unstable/discrete/examples/schedulingQuals12.cpp @@ -8,7 +8,7 @@ #define ENABLE_TIMING #define ADD_NO_CACHING #define ADD_NO_PRUNING -#include +#include #include #include diff --git a/gtsam/discrete/examples/small.csv b/gtsam_unstable/discrete/examples/small.csv similarity index 100% rename from gtsam/discrete/examples/small.csv rename to gtsam_unstable/discrete/examples/small.csv diff --git a/gtsam/discrete/tests/testCSP.cpp b/gtsam_unstable/discrete/tests/testCSP.cpp similarity index 98% rename from gtsam/discrete/tests/testCSP.cpp rename to gtsam_unstable/discrete/tests/testCSP.cpp index cce32f09f..46bf61240 100644 --- a/gtsam/discrete/tests/testCSP.cpp +++ b/gtsam_unstable/discrete/tests/testCSP.cpp @@ -5,8 +5,8 @@ * @author Frank Dellaert */ -#include -#include +#include +#include #include #include #include diff --git a/gtsam/discrete/tests/testScheduler.cpp b/gtsam_unstable/discrete/tests/testScheduler.cpp similarity index 97% rename from gtsam/discrete/tests/testScheduler.cpp rename to gtsam_unstable/discrete/tests/testScheduler.cpp index 28e3e16ed..bf9273ad6 100644 --- a/gtsam/discrete/tests/testScheduler.cpp +++ b/gtsam_unstable/discrete/tests/testScheduler.cpp @@ -5,7 +5,7 @@ */ //#define ENABLE_TIMING -#include +#include #include #include @@ -149,7 +149,7 @@ TEST( schedulingExample, test) /* ************************************************************************* */ TEST( schedulingExample, smallFromFile) { - string path("../../../gtsam/discrete/examples/"); + string path("../../../gtsam_unstable/discrete/examples/"); Scheduler s(2, path + "small.csv"); // add areas diff --git a/gtsam/discrete/tests/testSudoku.cpp b/gtsam_unstable/discrete/tests/testSudoku.cpp similarity index 99% rename from gtsam/discrete/tests/testSudoku.cpp rename to gtsam_unstable/discrete/tests/testSudoku.cpp index 7e4139818..1bbac4777 100644 --- a/gtsam/discrete/tests/testSudoku.cpp +++ b/gtsam_unstable/discrete/tests/testSudoku.cpp @@ -5,7 +5,7 @@ * @author Frank Dellaert */ -#include +#include #include #include #include