From fbfa287d4bac58355245e17720fcff7c776d61d6 Mon Sep 17 00:00:00 2001 From: Luca Date: Mon, 17 Feb 2014 17:43:30 -0500 Subject: [PATCH] added parameters in "print" for LM --- .cproject | 466 +++++++++--------- .../nonlinear/LevenbergMarquardtOptimizer.cpp | 4 + 2 files changed, 250 insertions(+), 220 deletions(-) diff --git a/.cproject b/.cproject index 6660ab682..f4f6a288f 100644 --- a/.cproject +++ b/.cproject @@ -540,14 +540,6 @@ true true - - make - -j2 - testGaussianFactor.run - true - true - true - make -j2 @@ -574,6 +566,7 @@ make + tests/testBayesTree.run true false @@ -581,6 +574,7 @@ make + testBinaryBayesNet.run true false @@ -628,6 +622,7 @@ make + testSymbolicBayesNet.run true false @@ -635,6 +630,7 @@ make + tests/testSymbolicFactor.run true false @@ -642,6 +638,7 @@ make + testSymbolicFactorGraph.run true false @@ -657,11 +654,20 @@ make + tests/testBayesTree true false true + + make + -j2 + testGaussianFactor.run + true + true + true + make -j5 @@ -758,22 +764,6 @@ false true - - make - -j2 - all - true - true - true - - - make - -j2 - clean - true - true - true - make -j2 @@ -790,6 +780,22 @@ true true + + make + -j2 + all + true + true + true + + + make + -j2 + clean + true + true + true + make -j2 @@ -814,70 +820,6 @@ true true - - make - -j2 - all - true - true - true - - - make - -j2 - check - true - true - true - - - make - -j2 - clean - true - true - true - - - make - -j5 - testValues.run - true - true - true - - - make - -j5 - testOrdering.run - true - true - true - - - make - -j5 - testKey.run - true - true - true - - - make - -j5 - testLinearContainerFactor.run - true - true - true - - - make - -j6 -j8 - testWhiteNoiseFactor.run - true - true - true - make -j5 @@ -942,6 +884,70 @@ true true + + make + -j5 + testValues.run + true + true + true + + + make + -j5 + testOrdering.run + true + true + true + + + make + -j5 + testKey.run + true + true + true + + + make + -j5 + testLinearContainerFactor.run + true + true + true + + + make + -j6 -j8 + testWhiteNoiseFactor.run + true + true + true + + + make + -j2 + all + true + true + true + + + make + -j2 + check + true + true + true + + + make + -j2 + clean + true + true + true + make -j5 @@ -1328,6 +1334,7 @@ make + testGraph.run true false @@ -1335,6 +1342,7 @@ make + testJunctionTree.run true false @@ -1342,6 +1350,7 @@ make + testSymbolicBayesNetB.run true false @@ -1509,6 +1518,7 @@ make + testErrors.run true false @@ -1554,22 +1564,6 @@ true true - - make - -j5 - testParticleFactor.run - true - true - true - - - make - -j2 - testGaussianFactor.run - true - true - true - make -j2 @@ -1650,6 +1644,22 @@ true true + + make + -j2 + testGaussianFactor.run + true + true + true + + + make + -j5 + testParticleFactor.run + true + true + true + make -j2 @@ -2012,7 +2022,6 @@ make - testSimulated2DOriented.run true false @@ -2052,7 +2061,6 @@ make - testSimulated2D.run true false @@ -2060,7 +2068,6 @@ make - testSimulated3D.run true false @@ -2074,6 +2081,22 @@ true true + + make + -j5 + testImuFactor.run + true + true + true + + + make + -j5 + testCombinedImuFactor.run + true + true + true + make -j5 @@ -2106,10 +2129,10 @@ true true - + make -j5 - testHessianFactorUnordered.run + testHessianFactor.run true true true @@ -2162,10 +2185,10 @@ true true - + make -j5 - testJacobianFactorUnordered.run + testJacobianFactor.run true true true @@ -2348,7 +2371,6 @@ make - tests/testGaussianISAM2 true false @@ -2370,102 +2392,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 @@ -2667,6 +2593,7 @@ cpack + -G DEB true false @@ -2674,6 +2601,7 @@ cpack + -G RPM true false @@ -2681,6 +2609,7 @@ cpack + -G TGZ true false @@ -2688,6 +2617,7 @@ cpack + --config CPackSourceConfig.cmake true false @@ -2853,34 +2783,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 @@ -2924,6 +2918,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/nonlinear/LevenbergMarquardtOptimizer.cpp b/gtsam/nonlinear/LevenbergMarquardtOptimizer.cpp index 64538f068..7411c082d 100644 --- a/gtsam/nonlinear/LevenbergMarquardtOptimizer.cpp +++ b/gtsam/nonlinear/LevenbergMarquardtOptimizer.cpp @@ -66,6 +66,10 @@ void LevenbergMarquardtParams::print(const std::string& str) const { std::cout << " lambdaInitial: " << lambdaInitial << "\n"; std::cout << " lambdaFactor: " << lambdaFactor << "\n"; std::cout << " lambdaUpperBound: " << lambdaUpperBound << "\n"; + std::cout << " lambdaLowerBound: " << lambdaLowerBound << "\n"; + std::cout << " disableInnerIterations: " << disableInnerIterations << "\n"; + std::cout << " minModelFidelity: " << minModelFidelity << "\n"; + std::cout << " diagonalDamping: " << diagonalDamping << "\n"; std::cout << " verbosityLM: " << verbosityLMTranslator(verbosityLM) << "\n"; std::cout.flush(); }