diff --git a/.cproject b/.cproject index dd5f6dc09..2ba852f9a 100644 --- a/.cproject +++ b/.cproject @@ -307,14 +307,6 @@ true true - - make - -j2 - testGaussianFactor.run - true - true - true - make -j2 @@ -341,6 +333,7 @@ make + tests/testBayesTree.run true false @@ -348,6 +341,7 @@ make + testBinaryBayesNet.run true false @@ -395,6 +389,7 @@ make + testSymbolicBayesNet.run true false @@ -402,6 +397,7 @@ make + tests/testSymbolicFactor.run true false @@ -409,6 +405,7 @@ make + testSymbolicFactorGraph.run true false @@ -424,11 +421,20 @@ make + tests/testBayesTree true false true + + make + -j2 + testGaussianFactor.run + true + true + true + make -j5 @@ -517,22 +523,6 @@ false true - - make - -j2 - all - true - true - true - - - make - -j2 - clean - true - true - true - make -j2 @@ -549,6 +539,22 @@ true true + + make + -j2 + all + true + true + true + + + make + -j2 + clean + true + true + true + make -j2 @@ -573,34 +579,26 @@ true true - + make - -j5 - testValues.run + -j2 + all true true true - + make - -j5 - testOrdering.run + -j2 + check true true true - + make - -j5 - testKey.run - true - true - true - - - make - -j5 - testLinearContainerFactor.run + -j2 + clean true true true @@ -685,26 +683,34 @@ true true - + make - -j2 - all + -j5 + testValues.run true true true - + make - -j2 - check + -j5 + testOrdering.run true true true - + make - -j2 - clean + -j5 + testKey.run + true + true + true + + + make + -j5 + testLinearContainerFactor.run true true true @@ -1047,6 +1053,7 @@ make + testGraph.run true false @@ -1054,6 +1061,7 @@ make + testJunctionTree.run true false @@ -1061,6 +1069,7 @@ make + testSymbolicBayesNetB.run true false @@ -1220,6 +1229,7 @@ make + testErrors.run true false @@ -1265,14 +1275,6 @@ true true - - make - -j2 - testGaussianFactor.run - true - true - true - make -j2 @@ -1353,6 +1355,14 @@ true true + + make + -j2 + testGaussianFactor.run + true + true + true + make -j2 @@ -1683,7 +1693,6 @@ make - testSimulated2DOriented.run true false @@ -1723,7 +1732,6 @@ make - testSimulated2D.run true false @@ -1731,7 +1739,6 @@ make - testSimulated3D.run true false @@ -1753,6 +1760,38 @@ true true + + make + -j5 + timeMatrixOps + true + true + true + + + make + -j5 + timeTest + true + true + true + + + make + -j5 + timeVirtual + true + true + true + + + make + -j5 + timeVirtual2 + true + true + true + make -j5 @@ -1931,7 +1970,6 @@ make - tests/testGaussianISAM2 true false @@ -1953,102 +1991,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 -j3 @@ -2250,6 +2192,7 @@ cpack + -G DEB true false @@ -2257,6 +2200,7 @@ cpack + -G RPM true false @@ -2264,6 +2208,7 @@ cpack + -G TGZ true false @@ -2271,6 +2216,7 @@ cpack + --config CPackSourceConfig.cmake true false @@ -2396,34 +2342,98 @@ true true - + make - -j5 - testSpirit.run + -j2 + testRot3.run true true true - + make - -j5 - testWrap.run + -j2 + testRot2.run true true true - + make - -j5 - check.wrap + -j2 + testPose3.run true true true - + make - -j5 - wrap + -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 @@ -2467,6 +2477,38 @@ false true + + make + -j5 + testSpirit.run + true + true + true + + + make + -j5 + testWrap.run + true + true + true + + + make + -j5 + check.wrap + true + true + true + + + make + -j5 + wrap + true + true + true + diff --git a/gtsam/base/CMakeLists.txt b/gtsam/base/CMakeLists.txt index 011992810..a4c30d5a4 100644 --- a/gtsam/base/CMakeLists.txt +++ b/gtsam/base/CMakeLists.txt @@ -9,8 +9,11 @@ set(base_local_libs # Files to exclude from compilation of tests and timing scripts set(base_excluded_files -# "${CMAKE_CURRENT_SOURCE_DIR}/tests/testTypedDiscreteFactor.cpp" # Example of excluding a test - "" # Add to this list, with full path, to exclude +# "${CMAKE_CURRENT_SOURCE_DIR}/tests/testTypedDiscreteFactor.cpp" # Example of excluding a test + "${CMAKE_CURRENT_SOURCE_DIR}/tests/timeTest.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/tests/timeVirtual.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/tests/timeVirtual2.cpp" +# "" # Add to this list, with full path, to exclude ) # Build tests diff --git a/gtsam/base/tests/timeMatrixOps.cpp b/gtsam/base/tests/timeMatrixOps.cpp index d749a4e39..e924c8402 100644 --- a/gtsam/base/tests/timeMatrixOps.cpp +++ b/gtsam/base/tests/timeMatrixOps.cpp @@ -38,8 +38,8 @@ using namespace boost::lambda; static boost::variate_generator > rng(boost::mt19937(), boost::uniform_real<>(-1.0, 0.0)); //typedef ublas::matrix matrix; //typedef ublas::matrix_range matrix_range; -typedef Eigen::Matrix matrix; -typedef Eigen::Block matrix_block; +//typedef Eigen::Matrix matrix; +//typedef Eigen::Block matrix_block; //using ublas::range; //using ublas::triangular_matrix; @@ -57,10 +57,10 @@ int main(int argc, char* argv[]) { assert(m > n); boost::variate_generator > rni(boost::mt19937(), boost::uniform_int(0,m-1)); boost::variate_generator > rnj(boost::mt19937(), boost::uniform_int(0,n-1)); - matrix mat(m,n); - matrix_block full = mat.block(0, 0, m, n); - matrix_block top = mat.block(0, 0, n, n); - matrix_block block = mat.block(m/4, n/4, m-m/2, n-n/2); + gtsam::Matrix mat((int)m,(int)n); + gtsam::SubMatrix full = mat.block(0, 0, m, n); + gtsam::SubMatrix top = mat.block(0, 0, n, n); + gtsam::SubMatrix block = mat.block(m/4, n/4, m-m/2, n-n/2); cout << format(" Basic: %1%x%2%\n") % m % n; cout << format(" Full: mat(%1%:%2%, %3%:%4%)\n") % 0 % m % 0 % n; diff --git a/gtsam/base/tests/timeTest.cpp b/gtsam/base/tests/timeTest.cpp index 807e95508..707f24b26 100644 --- a/gtsam/base/tests/timeTest.cpp +++ b/gtsam/base/tests/timeTest.cpp @@ -19,6 +19,7 @@ int main(int argc, char *argv[]) { + // FIXME: ticPush_ does not exist ticPush_("1", "top 1"); ticPush_("1", "sub 1"); gttic_("sub sub a"); diff --git a/gtsam/linear/CMakeLists.txt b/gtsam/linear/CMakeLists.txt index 88417e268..3db38b953 100644 --- a/gtsam/linear/CMakeLists.txt +++ b/gtsam/linear/CMakeLists.txt @@ -13,8 +13,10 @@ set(linear_local_libs # Files to exclude from compilation of tests and timing scripts set(linear_excluded_files -# "${CMAKE_CURRENT_SOURCE_DIR}/tests/testTypedDiscreteFactor.cpp" # Example of excluding a test - "" # Add to this list, with full path, to exclude +# "${CMAKE_CURRENT_SOURCE_DIR}/tests/testTypedDiscreteFactor.cpp" # Example of excluding a test + "${CMAKE_CURRENT_SOURCE_DIR}/tests/timeSLAMlike.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/tests/timeFactorOverhead.cpp" +# "" # Add to this list, with full path, to exclude ) # Build tests diff --git a/gtsam/linear/tests/timeSLAMlike.cpp b/gtsam/linear/tests/timeSLAMlike.cpp index 3b66b6fd4..340e16a79 100644 --- a/gtsam/linear/tests/timeSLAMlike.cpp +++ b/gtsam/linear/tests/timeSLAMlike.cpp @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include