diff --git a/.cproject b/.cproject index f2f172b9e..e75e9b8e8 100644 --- a/.cproject +++ b/.cproject @@ -39,6 +39,7 @@ + @@ -286,7 +287,7 @@ - + make -j2 check @@ -294,15 +295,7 @@ true true - - make - -j2 - tests/testSPQRUtil.run - true - true - true - - + make -j2 clean @@ -310,10 +303,162 @@ true true - + make -j2 - testGaussianFactor.run + testBTree.run + true + true + true + + + make + -j2 + testDSF.run + true + true + true + + + make + -j2 + testDSFVector.run + true + true + true + + + make + -j2 + testMatrix.run + true + true + true + + + make + -j2 + testSPQRUtil.run + true + true + true + + + make + -j2 + testVector.run + true + true + true + + + make + -j2 + timeMatrix.run + true + true + true + + + make + -j2 + all + true + true + true + + + make + -j2 + tests/testDSFVector.run + true + true + true + + + make + -j2 + tests/testTestableAssertions.run + true + true + true + + + make + -j2 + tests/testVector.run + true + true + true + + + make + -j2 + tests/testMatrix.run + true + true + true + + + make + -j2 + check + true + true + true + + + make + -j2 + tests/testNumericalDerivative.run + true + true + true + + + make + -j2 + tests/testBlockMatrices.run + true + true + true + + + make + -j2 + clean + true + true + true + + + make + -j2 + tests/testCholesky.run + true + true + true + + + make + -j2 + check + true + true + true + + + make + -j2 + tests/testLieConfig.run + true + true + true + + + make + -j2 + vSFMexample.run true true true @@ -344,6 +489,7 @@ make + tests/testBayesTree.run true false @@ -351,6 +497,7 @@ make + testBinaryBayesNet.run true false @@ -398,6 +545,7 @@ make + testSymbolicBayesNet.run true false @@ -405,6 +553,7 @@ make + tests/testSymbolicFactor.run true false @@ -412,6 +561,7 @@ make + testSymbolicFactorGraph.run true false @@ -427,99 +577,12 @@ make + tests/testBayesTree true false true - - make - -j2 - all - true - true - true - - - make - -j2 - check - true - true - true - - - make - -j2 - clean - true - true - true - - - make - -j5 - all - true - false - true - - - make - -j5 - check - true - false - true - - - make - -j2 - tests/testPose2.run - true - true - true - - - make - -j2 - tests/testPose3.run - true - true - true - - - make - -j2 - all - true - true - true - - - make - -j2 - clean - true - true - true - - - make - -j2 - clean all - true - true - true - - - make - -j2 - check - true - true - true - make -j2 @@ -560,15 +623,7 @@ true true - - make - -j2 - all - true - true - true - - + make -j2 check @@ -576,7 +631,15 @@ true true - + + make + -j2 + tests/testSPQRUtil.run + true + true + true + + make -j2 clean @@ -616,15 +679,23 @@ true true - + make -j2 - vSFMexample.run + all true true true - + + make + -j2 + clean + true + true + true + + make -j2 check @@ -632,10 +703,65 @@ true true - + make -j2 - testVSLAMGraph + all + true + true + true + + + make + -j2 + check + true + true + true + + + make + -j2 + clean + true + true + true + + + make + -j2 + check + true + true + true + + + make + tests/testGaussianISAM2 + true + false + true + + + make + -j2 + install + true + true + true + + + make + -j2 + check + true + true + true + + + make + -j2 + clean true true true @@ -792,23 +918,79 @@ true true - + make -j2 - all + testRot3.run true true true - + make -j2 - clean + 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 @@ -816,15 +998,502 @@ true true - + make -j2 - testGaussianConditional.run + clean true true true - + + make + -j2 + testPoint2.run + true + true + true + + + make + -j2 + check + true + true + true + + + make + -j2 + tests/testVectorValues.run + true + true + true + + + make + -j2 + tests/testNoiseModel.run + true + true + true + + + make + -j2 + tests/testGaussianFactor.run + true + true + true + + + make + -j2 + tests/testHessianFactor.run + true + true + true + + + make + -j2 + check + 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 + clean + true + true + true + + + make + -j2 + tests/testKalmanFilter.run + true + true + true + + + make + -j2 + tests/testGaussianDensity.run + true + true + true + + + make + -j2 + install + true + true + true + + + make + -j2 + clean + true + true + true + + + cmake + .. + true + false + true + + + make + -j2 VERBOSE=1 + all + true + false + true + + + make + -j5 VERBOSE=1 + all + true + false + true + + + make + -j2 + clean + true + true + true + + + make + -j1 + check + true + false + true + + + make + -j5 + check + true + false + true + + + make + -j2 + install + true + true + true + + + make + -j2 + timing + true + true + true + + + make + -j5 + install + true + false + true + + + make + -j2 + base.testMatrix.run + true + true + true + + + make + -j2 + check.base + true + true + true + + + make + -j2 + timing.base + true + true + true + + + make + -j2 + base + true + true + true + + + make + -j2 + base.testVector.run + true + true + true + + + make + -j2 + base.timeMatrix.run + true + true + true + + + make + -j2 VERBOSE=1 + check.geometry + true + false + true + + + make + -j2 + timing.geometry + true + true + true + + + make + -j2 + geometry + true + true + true + + + make + -j2 + geometry.testPoint2.run + true + true + true + + + make + -j2 + geometry.testPose2.run + true + true + true + + + make + -j2 + geometry.testPose3.run + true + true + true + + + make + -j1 VERBOSE=1 + geometry.testHomography2.run + true + false + true + + + make + -j2 VERBOSE=1 + check.inference + true + false + true + + + make + -j2 VERBOSE=1 + check.linear + true + false + true + + + make + -j2 VERBOSE=1 + check.nonlinear + true + false + true + + + make + -j2 VERBOSE=1 + check.slam + true + false + true + + + make + -j2 + gtsam-static + true + true + true + + + make + -j2 + gtsam-shared + true + true + true + + + make + -j2 + check.tests + true + true + true + + + make + -j2 + tests.testSerialization.run + true + true + true + + + make + -j2 + timing.inference + true + true + true + + + make + -j2 + timing.linear + true + true + true + + + make + -j2 + timing.nonlinear + true + true + true + + + make + -j2 + timing.slam + true + true + true + + + make + -j2 + timing.tests + true + true + true + + + make + -j2 + inference + true + true + true + + + make + -j2 + linear + true + true + true + + + make + -j2 + nonlinear + true + true + true + + + make + -j2 + slam + true + true + true + + + make + -j2 + examples + true + true + true + + + make + -j2 + wrap + true + true + true + + + make + -j2 + check.wrap + true + true + true + + + make + -j2 + wrap_gtsam + true + true + true + + + make + -j5 + check install + true + false + true + + + make + -j2 + check install + true + true + true + + + make + -j2 + wrap.testWrap.run + true + true + true + + make -j2 testGaussianFactor.run @@ -832,59 +1501,68 @@ true true - + make -j2 - timeGaussianFactor.run + check true true true - + make -j2 - timeVectorConfig.run + install true true true - + make -j2 - testVectorBTree.run + tests/testSpirit.run true true true - + make -j2 - testVectorMap.run + tests/testWrap.run true true true - + make -j2 - testNoiseModel.run + clean true true true - + make -j2 - testBayesNetPreconditioner.run + all true true true - + make - testErrors.run + -j2 + all true - false + true + true + + + make + -j2 + clean + true + true true @@ -927,7 +1605,39 @@ true true - + + make + -j2 + tests/testPose2.run + true + true + true + + + make + -j2 + tests/testPose3.run + true + true + true + + + make + -j2 + tests/testStereoCamera.run + true + true + true + + + make + -j2 + tests/testRot3M.run + true + true + true + + make -j2 check @@ -935,7 +1645,79 @@ true true - + + make + -j2 + tests/testPose2.run + true + true + true + + + make + -j2 + tests/testPose3.run + true + true + true + + + make + -j2 + tests/testPoint3.run + true + true + true + + + make + -j2 + tests/testCalibratedCamera.run + true + true + true + + + make + -j2 + tests/timeRot3.run + true + true + true + + + make + -j2 + tests/timePose3.run + true + true + true + + + make + -j2 + tests/timeStereoCamera.run + true + true + true + + + make + -j2 + tests/testPoint2.run + true + true + true + + + make + -j2 + check + true + true + true + + make -j2 clean @@ -943,63 +1725,15 @@ true true - + make -j2 - testBTree.run + install true true true - - make - -j2 - testDSF.run - true - true - true - - - make - -j2 - testDSFVector.run - true - true - true - - - make - -j2 - testMatrix.run - true - true - true - - - make - -j2 - testSPQRUtil.run - true - true - true - - - make - -j2 - testVector.run - true - true - true - - - make - -j2 - timeMatrix.run - true - true - true - - + make -j2 all @@ -1007,7 +1741,30 @@ true true - + + cmake + .. + true + false + true + + + make + -j2 + SimpleRotation.run + true + true + true + + + make + -j2 + testVSLAMGraph + true + true + true + + make -j2 testGaussianFactor.run @@ -1015,6 +1772,160 @@ true true + + make + -j2 + check + true + true + true + + + make + -j2 + testGaussianFactorGraph.run + true + true + true + + + make + -j2 + testGaussianISAM.run + true + true + true + + + make + testGraph.run + true + false + true + + + make + -j2 + testIterative.run + true + true + true + + + make + -j2 + testNonlinearEquality.run + true + true + true + + + make + -j2 + testNonlinearFactor.run + true + true + true + + + make + -j2 + testNonlinearFactorGraph.run + true + true + true + + + make + -j2 + testNonlinearOptimizer.run + true + true + true + + + make + -j2 + testSubgraphPreconditioner.run + true + true + true + + + make + -j2 + testTupleConfig.run + true + true + true + + + make + -j2 + timeGaussianFactorGraph.run + true + true + true + + + make + testInference.run + true + false + true + + + make + testGaussianFactor.run + true + false + true + + + make + testJunctionTree.run + true + false + true + + + make + testSymbolicBayesNet.run + true + false + true + + + make + testSymbolicFactorGraph.run + true + false + true + + + make + -j2 + clean + true + true + true + + + make + -j2 + testGaussianJunctionTree + true + true + true + + + make + -j2 + testSerialization.run + true + true + true + make -j2 @@ -1111,23 +2022,7 @@ true true - - make - -j2 - install - true - true - true - - - make - -j2 - clean - true - true - true - - + make -j2 all @@ -1135,7 +2030,7 @@ true true - + make -j2 clean @@ -1143,7 +2038,87 @@ true true - + + make + -j2 + check + true + true + true + + + make + -j2 + testGaussianConditional.run + true + true + true + + + make + -j2 + testGaussianFactor.run + true + true + true + + + make + -j2 + timeGaussianFactor.run + true + true + true + + + make + -j2 + timeVectorConfig.run + true + true + true + + + make + -j2 + testVectorBTree.run + true + true + true + + + make + -j2 + testVectorMap.run + true + true + true + + + make + -j2 + testNoiseModel.run + true + true + true + + + make + -j2 + testBayesNetPreconditioner.run + true + true + true + + + make + + testErrors.run + true + false + true + + make -j2 all @@ -1151,7 +2126,7 @@ true true - + make -j2 clean @@ -1159,7 +2134,23 @@ true true - + + make + -j2 + clean all + true + true + true + + + make + -j2 + all + true + true + true + + make -j2 check @@ -1167,23 +2158,31 @@ true true - + make -j2 - tests/testStereoCamera.run + clean true true true - + make - -j2 - tests/testRot3M.run + -j5 + all true - true + false true - + + make + -j5 + check + true + false + true + + make -j2 check @@ -1191,70 +2190,6 @@ true true - - make - -j2 - tests/testPose2.run - true - true - true - - - make - -j2 - tests/testPose3.run - true - true - true - - - make - -j2 - tests/testPoint3.run - true - true - true - - - make - -j2 - tests/testCalibratedCamera.run - true - true - true - - - make - -j2 - tests/timeRot3.run - true - true - true - - - make - -j2 - tests/timePose3.run - true - true - true - - - make - -j2 - tests/timeStereoCamera.run - true - true - true - - - make - -j2 - tests/testPoint2.run - true - true - true - make -j2 @@ -1337,7 +2272,6 @@ make - testSimulated2DOriented.run true false @@ -1377,7 +2311,6 @@ make - testSimulated2D.run true false @@ -1385,7 +2318,6 @@ make - testSimulated3D.run true false @@ -1399,166 +2331,6 @@ true true - - make - -j2 - tests/testDSFVector.run - true - true - true - - - make - -j2 - tests/testTestableAssertions.run - true - true - true - - - make - -j2 - tests/testVector.run - true - true - true - - - make - -j2 - tests/testMatrix.run - true - true - true - - - make - -j2 - check - true - true - true - - - make - -j2 - tests/testNumericalDerivative.run - true - true - true - - - make - -j2 - tests/testBlockMatrices.run - true - true - true - - - make - -j2 - clean - true - true - true - - - make - -j2 - tests/testCholesky.run - true - true - true - - - make - -j2 - tests/testVectorValues.run - true - true - true - - - make - -j2 - tests/testNoiseModel.run - true - true - true - - - make - -j2 - tests/testGaussianFactor.run - true - true - true - - - make - -j2 - tests/testHessianFactor.run - true - true - true - - - make - -j2 - check - 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 - clean - true - true - true - - - make - -j2 - tests/testKalmanFilter.run - true - true - true - - - make - -j2 - tests/testGaussianDensity.run - true - true - true - make -j2 @@ -1639,119 +2411,15 @@ true true - + make -j2 - check + install true true true - - make - - tests/testGaussianISAM2 - true - false - true - - - make - -j2 - check - true - true - true - - - make - -j2 - tests/testLieConfig.run - true - 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 @@ -1759,430 +2427,39 @@ true true - - make - -j2 - testPoint2.run - true - true - true - make - -j5 + -j2 check true true true - - make - -j1 - check - true - false - true - - + make -j2 - clean + all true true true - + make -j2 - install + dist true true true - - make - -j2 VERBOSE=1 - all - true - false - true - - - make - -j5 VERBOSE=1 - all - true - false - true - - - make - -j5 - base - true - true - true - - - make - -j5 - base.testMatrix.run - true - true - true - - - make - -j5 - base.testVector.run - true - true - true - - - make - -j5 - base.timeMatrix.run - true - true - true - - - make - -j5 - check.base - true - true - true - - - make - -j2 VERBOSE=1 - check.geometry - true - false - true - - - make - -j2 VERBOSE=1 - check.inference - true - false - true - - - make - -j2 VERBOSE=1 - check.linear - true - false - true - - - make - -j2 VERBOSE=1 - check.nonlinear - true - false - true - - - make - -j2 VERBOSE=1 - check.slam - true - false - true - - - make - -j5 - check.tests - true - true - true - - - make - -j5 - check.wrap - true - true - true - - - make - -j5 - check install - true - true - true - - - make - -j5 - check install - true - false - true - - - make - -j5 - check - true - false - true - - + cmake .. + true false true - - make - -j5 - examples - true - true - true - - - make - -j5 - geometry - true - true - true - - - make - -j1 VERBOSE=1 - geometry.testHomography2.run - true - false - true - - - make - -j5 - geometry.testPoint2.run - true - true - true - - - make - -j5 - geometry.testPose2.run - true - true - true - - - make - -j5 - geometry.testPose3.run - true - true - true - - - make - -j5 - gtsam-shared - true - true - true - - - make - -j5 - gtsam-static - true - true - true - - - make - -j5 - inference - true - true - true - - - make - -j5 - install - true - false - true - - - make - -j5 - linear - true - true - true - - - make - -j5 - nonlinear - true - true - true - - - make - -j5 - slam - true - true - true - - - make - -j5 - tests.testSerialization.run - true - true - true - - - make - -j5 - timing - true - true - true - - - make - -j5 - timing.base - true - true - true - - - make - -j5 - timing.geometry - true - true - true - - - make - -j5 - timing.inference - true - true - true - - - make - -j5 - timing.linear - true - true - true - - - make - -j5 - timing.nonlinear - true - true - true - - - make - -j5 - timing.slam - true - true - true - - - make - -j5 - timing.tests - true - true - true - - - make - -j5 - wrap - true - true - true - - - make - -j5 - wrap_gtsam - true - true - true - - - make - -j5 - wrap.testWrap.run - true - true - true - - - make - -j2 - check - true - true - true - - - make - -j2 - install - true - true - true - - - make - -j2 - tests/testSpirit.run - true - true - true - - - make - -j2 - tests/testWrap.run - true - true - true - - - make - -j2 - clean - true - true - true - - + make -j2 all @@ -2190,6 +2467,14 @@ true true + + make + -j2 + clean + true + true + true + diff --git a/gtsam/nonlinear/tests/testValues.cpp b/gtsam/nonlinear/tests/testValues.cpp index 1e9752127..fac527dec 100644 --- a/gtsam/nonlinear/tests/testValues.cpp +++ b/gtsam/nonlinear/tests/testValues.cpp @@ -262,11 +262,16 @@ TEST(Values, update) /* ************************************************************************* */ TEST(Values, filter) { + Pose2 pose0(1.0, 2.0, 0.3); + Pose3 pose1(Pose2(0.1, 0.2, 0.3)); + Pose2 pose2(4.0, 5.0, 0.6); + Pose3 pose3(Pose2(0.3, 0.7, 0.9)); + Values values; - values.insert(0, Pose2()); - values.insert(1, Pose3()); - values.insert(2, Pose2()); - values.insert(3, Pose3()); + values.insert(0, pose0); + values.insert(1, pose1); + values.insert(2, pose2); + values.insert(3, pose3); // Filter by key int i = 0; @@ -275,9 +280,11 @@ TEST(Values, filter) { if(i == 0) { LONGS_EQUAL(2, it->first); EXPECT(typeid(Pose2) == typeid(it->second)); + EXPECT(assert_equal(pose2, dynamic_cast(it->second))); } else if(i == 1) { LONGS_EQUAL(3, it->first); EXPECT(typeid(Pose3) == typeid(it->second)); + EXPECT(assert_equal(pose3, dynamic_cast(it->second))); } else { EXPECT(false); } @@ -290,10 +297,10 @@ TEST(Values, filter) { it != values.endFilterByType(); ++it, ++i) { if(i == 0) { LONGS_EQUAL(1, it->first); - EXPECT(assert_equal(Pose3(), it->second)); + EXPECT(assert_equal(pose1, it->second)); } else if(i == 1) { LONGS_EQUAL(3, it->first); - EXPECT(assert_equal(Pose3(), it->second)); + EXPECT(assert_equal(pose3, it->second)); } else { EXPECT(false); }