From c1a10f2cf78036a3f8a6b1a3eeb21e43de858bd7 Mon Sep 17 00:00:00 2001 From: dellaert Date: Wed, 26 Nov 2014 17:25:40 +0100 Subject: [PATCH 1/5] Moved files --- {gtsam_unstable => gtsam}/nonlinear/Expression-inl.h | 0 {gtsam_unstable => gtsam}/nonlinear/Expression.h | 2 +- {gtsam_unstable => gtsam}/nonlinear/tests/testExpression.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {gtsam_unstable => gtsam}/nonlinear/Expression-inl.h (100%) rename {gtsam_unstable => gtsam}/nonlinear/Expression.h (99%) rename {gtsam_unstable => gtsam}/nonlinear/tests/testExpression.cpp (99%) diff --git a/gtsam_unstable/nonlinear/Expression-inl.h b/gtsam/nonlinear/Expression-inl.h similarity index 100% rename from gtsam_unstable/nonlinear/Expression-inl.h rename to gtsam/nonlinear/Expression-inl.h diff --git a/gtsam_unstable/nonlinear/Expression.h b/gtsam/nonlinear/Expression.h similarity index 99% rename from gtsam_unstable/nonlinear/Expression.h rename to gtsam/nonlinear/Expression.h index 68a79ed6b..85b223440 100644 --- a/gtsam_unstable/nonlinear/Expression.h +++ b/gtsam/nonlinear/Expression.h @@ -19,7 +19,7 @@ #pragma once -#include "Expression-inl.h" +#include #include #include diff --git a/gtsam_unstable/nonlinear/tests/testExpression.cpp b/gtsam/nonlinear/tests/testExpression.cpp similarity index 99% rename from gtsam_unstable/nonlinear/tests/testExpression.cpp rename to gtsam/nonlinear/tests/testExpression.cpp index 6156d103c..dfa60e54e 100644 --- a/gtsam_unstable/nonlinear/tests/testExpression.cpp +++ b/gtsam/nonlinear/tests/testExpression.cpp @@ -17,9 +17,9 @@ * @brief unit tests for Block Automatic Differentiation */ +#include #include #include -#include #include #include From e3272115a2ce3ba0781e118e4d8748d974186f7d Mon Sep 17 00:00:00 2001 From: dellaert Date: Wed, 26 Nov 2014 17:25:51 +0100 Subject: [PATCH 2/5] Moved target --- .cproject | 114 +++++++++++++++++++++++++----------------------------- 1 file changed, 52 insertions(+), 62 deletions(-) diff --git a/.cproject b/.cproject index d42d2b0e0..9c03c5b7d 100644 --- a/.cproject +++ b/.cproject @@ -592,7 +592,6 @@ make - tests/testBayesTree.run true false @@ -600,7 +599,6 @@ make - testBinaryBayesNet.run true false @@ -648,7 +646,6 @@ make - testSymbolicBayesNet.run true false @@ -656,7 +653,6 @@ make - tests/testSymbolicFactor.run true false @@ -664,7 +660,6 @@ make - testSymbolicFactorGraph.run true false @@ -680,7 +675,6 @@ make - tests/testBayesTree true false @@ -1128,7 +1122,6 @@ make - testErrors.run true false @@ -1358,46 +1351,6 @@ true true - - make - -j5 - testBTree.run - true - true - true - - - make - -j5 - testDSF.run - true - true - true - - - make - -j5 - testDSFMap.run - true - true - true - - - make - -j5 - testDSFVector.run - true - true - true - - - make - -j5 - testFixedVector.run - true - true - true - make -j2 @@ -1480,6 +1433,7 @@ make + testSimulated2DOriented.run true false @@ -1519,6 +1473,7 @@ make + testSimulated2D.run true false @@ -1526,6 +1481,7 @@ make + testSimulated3D.run true false @@ -1539,6 +1495,46 @@ true true + + make + -j5 + testBTree.run + true + true + true + + + make + -j5 + testDSF.run + true + true + true + + + make + -j5 + testDSFMap.run + true + true + true + + + make + -j5 + testDSFVector.run + true + true + true + + + make + -j5 + testFixedVector.run + true + true + true + make -j5 @@ -1796,7 +1792,6 @@ cpack - -G DEB true false @@ -1804,7 +1799,6 @@ cpack - -G RPM true false @@ -1812,7 +1806,6 @@ cpack - -G TGZ true false @@ -1820,7 +1813,6 @@ cpack - --config CPackSourceConfig.cmake true false @@ -2635,7 +2627,6 @@ make - testGraph.run true false @@ -2643,7 +2634,6 @@ make - testJunctionTree.run true false @@ -2651,7 +2641,6 @@ make - testSymbolicBayesNetB.run true false @@ -2737,14 +2726,6 @@ true true - - make - -j5 - testExpression.run - true - true - true - make -j5 @@ -3137,6 +3118,14 @@ true true + + make + -j4 + testExpression.run + true + true + true + make -j4 @@ -3195,6 +3184,7 @@ make + tests/testGaussianISAM2 true false From 72644b8ff304d70ab2b6af44d6209bca02fcfda4 Mon Sep 17 00:00:00 2001 From: dellaert Date: Wed, 26 Nov 2014 17:26:04 +0100 Subject: [PATCH 3/5] Fixed headers --- gtsam_unstable/nonlinear/ExpressionFactor.h | 2 +- gtsam_unstable/nonlinear/expressionTesting.h | 8 +++++--- gtsam_unstable/nonlinear/expressions.h | 2 +- gtsam_unstable/nonlinear/tests/testAdaptAutoDiff.cpp | 5 ++--- .../nonlinear/tests/testCustomChartExpression.cpp | 5 ----- tests/testManifold.cpp | 3 +-- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/gtsam_unstable/nonlinear/ExpressionFactor.h b/gtsam_unstable/nonlinear/ExpressionFactor.h index f763915e0..95c4d71a8 100644 --- a/gtsam_unstable/nonlinear/ExpressionFactor.h +++ b/gtsam_unstable/nonlinear/ExpressionFactor.h @@ -19,7 +19,7 @@ #pragma once -#include +#include #include #include #include diff --git a/gtsam_unstable/nonlinear/expressionTesting.h b/gtsam_unstable/nonlinear/expressionTesting.h index 92c8f71e8..4fd47eb76 100644 --- a/gtsam_unstable/nonlinear/expressionTesting.h +++ b/gtsam_unstable/nonlinear/expressionTesting.h @@ -19,14 +19,16 @@ #pragma once -#include "Expression.h" -#include "ExpressionFactor.h" +#include +#include #include #include +#include +#include + #include #include #include -#include namespace gtsam { diff --git a/gtsam_unstable/nonlinear/expressions.h b/gtsam_unstable/nonlinear/expressions.h index eba85c33c..2490100d6 100644 --- a/gtsam_unstable/nonlinear/expressions.h +++ b/gtsam_unstable/nonlinear/expressions.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include namespace gtsam { diff --git a/gtsam_unstable/nonlinear/tests/testAdaptAutoDiff.cpp b/gtsam_unstable/nonlinear/tests/testAdaptAutoDiff.cpp index cd281f4d8..a8151ec11 100644 --- a/gtsam_unstable/nonlinear/tests/testAdaptAutoDiff.cpp +++ b/gtsam_unstable/nonlinear/tests/testAdaptAutoDiff.cpp @@ -17,8 +17,9 @@ * @brief unit tests for Block Automatic Differentiation */ +#include #include -#include +#include #include #include #include @@ -27,8 +28,6 @@ #include #include -#include - #include #include diff --git a/gtsam_unstable/nonlinear/tests/testCustomChartExpression.cpp b/gtsam_unstable/nonlinear/tests/testCustomChartExpression.cpp index bc2055c55..440400fb4 100644 --- a/gtsam_unstable/nonlinear/tests/testCustomChartExpression.cpp +++ b/gtsam_unstable/nonlinear/tests/testCustomChartExpression.cpp @@ -17,12 +17,7 @@ * @brief unit tests for Block Automatic Differentiation */ -#include -#include #include -#include -#include - #include using namespace gtsam; diff --git a/tests/testManifold.cpp b/tests/testManifold.cpp index 32f04225f..1927ba5c6 100644 --- a/tests/testManifold.cpp +++ b/tests/testManifold.cpp @@ -22,9 +22,8 @@ #include #include #include -#include +#include #include -#include #undef CHECK #include From d5ca61972f7a69eb3b279f6f2c726495815923ff Mon Sep 17 00:00:00 2001 From: dellaert Date: Wed, 26 Nov 2014 17:31:46 +0100 Subject: [PATCH 4/5] Fixed assert --- gtsam_unstable/nonlinear/ceres_rotation.h | 1 + 1 file changed, 1 insertion(+) diff --git a/gtsam_unstable/nonlinear/ceres_rotation.h b/gtsam_unstable/nonlinear/ceres_rotation.h index 83627291c..b02c10211 100644 --- a/gtsam_unstable/nonlinear/ceres_rotation.h +++ b/gtsam_unstable/nonlinear/ceres_rotation.h @@ -47,6 +47,7 @@ #include #include +#include #define DCHECK assert namespace ceres { From e1b453b952945b1864163771a49f7e79d9e6557c Mon Sep 17 00:00:00 2001 From: dellaert Date: Wed, 26 Nov 2014 17:32:30 +0100 Subject: [PATCH 5/5] Fixed warning --- gtsam_unstable/examples/SmartStereoProjectionFactorExample.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/gtsam_unstable/examples/SmartStereoProjectionFactorExample.cpp b/gtsam_unstable/examples/SmartStereoProjectionFactorExample.cpp index f5e59b1b2..770c5f18c 100644 --- a/gtsam_unstable/examples/SmartStereoProjectionFactorExample.cpp +++ b/gtsam_unstable/examples/SmartStereoProjectionFactorExample.cpp @@ -49,7 +49,6 @@ int main(int argc, char** argv){ typedef SmartStereoProjectionPoseFactor SmartFactor; bool output_poses = true; - bool output_initial_poses = true; string poseOutput("../../../examples/data/optimized_poses.txt"); string init_poseOutput("../../../examples/data/initial_poses.txt"); Values initial_estimate;