This should make merging in develop easier, and it also helps me understand what changed. I mostly avoided conflicts by keeping Duy's versions of: Conflicts: gtsam/3rdparty/metis-5.1.0/CMakeLists.txt gtsam/linear/JacobianFactor-inl.h gtsam/linear/NoiseModel.cpp gtsam/nonlinear/NonlinearFactor.h and a number of other files. In particular, I did not upgrade Eigen or remove metis. The following unit tests fail in this branch: The following tests FAILED: 2 - testWrap (Failed) 85 - testGeneralSFMFactor (SEGFAULT) 142 - testIMUSystem (Failed) 178 - testTSAMFactors (Failed) |
||
|---|---|---|
| .. | ||
| tests | ||
| CMakeLists.txt | ||
| DoglegOptimizer.cpp | ||
| DoglegOptimizer.h | ||
| DoglegOptimizerImpl.cpp | ||
| DoglegOptimizerImpl.h | ||
| ExtendedKalmanFilter-inl.h | ||
| ExtendedKalmanFilter.h | ||
| GaussNewtonOptimizer.cpp | ||
| GaussNewtonOptimizer.h | ||
| ISAM2-impl.cpp | ||
| ISAM2-impl.h | ||
| ISAM2-inl.h | ||
| ISAM2.cpp | ||
| ISAM2.h | ||
| LevenbergMarquardtOptimizer.cpp | ||
| LevenbergMarquardtOptimizer.h | ||
| LinearContainerFactor.cpp | ||
| LinearContainerFactor.h | ||
| Marginals.cpp | ||
| Marginals.h | ||
| NonlinearConjugateGradientOptimizer.cpp | ||
| NonlinearConjugateGradientOptimizer.h | ||
| NonlinearEquality.h | ||
| NonlinearFactor.h | ||
| NonlinearFactorGraph.cpp | ||
| NonlinearFactorGraph.h | ||
| NonlinearISAM.cpp | ||
| NonlinearISAM.h | ||
| NonlinearOptimizer.cpp | ||
| NonlinearOptimizer.h | ||
| NonlinearOptimizerParams.cpp | ||
| NonlinearOptimizerParams.h | ||
| Symbol.h | ||
| Values-inl.h | ||
| Values.cpp | ||
| Values.h | ||
| WhiteNoiseFactor.h | ||
| nonlinearExceptions.h | ||