12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/fixedSizeDerivatives

release/4.3a0
dellaert 2014-12-05 22:23:12 +01:00
parent a5877a96b8 a7b61373a9
commit 468aa5d6b6
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtsam/base/LieMatrix.h
View File

@ -19,6 +19,7 @@
#include <cstdarg> #include <cstdarg>
#warning "LieMatrix.h is deprecated. Please use Eigen::Matrix instead."
#include <gtsam/base/DerivedValue.h> #include <gtsam/base/DerivedValue.h>
#include <gtsam/base/Lie.h> #include <gtsam/base/Lie.h>
#include <gtsam/base/Matrix.h> #include <gtsam/base/Matrix.h>
@ -27,7 +28,9 @@
namespace gtsam { namespace gtsam {
/** /**
* LieVector is a wrapper around vector to allow it to be a Lie type * @deprecated: LieScalar, LieVector and LieMatrix are obsolete in GTSAM 4.0 as
* we can directly add double, Vector, and Matrix into values now, because of
* gtsam::traits.
*/ */
struct LieMatrix : public Matrix { struct LieMatrix : public Matrix {

5
gtsam/base/LieScalar.h
View File

@ -17,6 +17,7 @@
#pragma once #pragma once
#warning "LieScalar.h is deprecated. Please use double/float instead."
#include <gtsam/dllexport.h> #include <gtsam/dllexport.h>
#include <gtsam/base/DerivedValue.h> #include <gtsam/base/DerivedValue.h>
#include <gtsam/base/Lie.h> #include <gtsam/base/Lie.h>
@ -24,7 +25,9 @@
namespace gtsam { namespace gtsam {
/** /**
* LieScalar is a wrapper around double to allow it to be a Lie type * @deprecated: LieScalar, LieVector and LieMatrix are obsolete in GTSAM 4.0 as
* we can directly add double, Vector, and Matrix into values now, because of
* gtsam::traits.
*/ */
struct GTSAM_EXPORT LieScalar { struct GTSAM_EXPORT LieScalar {

5
gtsam/base/LieVector.h
View File

@ -17,6 +17,7 @@
#pragma once #pragma once
#warning "LieVector.h is deprecated. Please use Eigen::Vector instead."
#include <gtsam/base/Lie.h> #include <gtsam/base/Lie.h>
#include <gtsam/base/Vector.h> #include <gtsam/base/Vector.h>
#include <gtsam/base/DerivedValue.h> #include <gtsam/base/DerivedValue.h>
@ -24,7 +25,9 @@
namespace gtsam { namespace gtsam {
/** /**
* LieVector is a wrapper around vector to allow it to be a Lie type * @deprecated: LieScalar, LieVector and LieMatrix are obsolete in GTSAM 4.0 as
* we can directly add double, Vector, and Matrix into values now, because of
* gtsam::traits.
*/ */
struct LieVector : public Vector { struct LieVector : public Vector {

2
gtsam_unstable/timing/timeAdaptAutoDiff.cpp
View File

@ -18,7 +18,7 @@
#include "timeLinearize.h" #include "timeLinearize.h"
#include <gtsam/3rdparty/ceres/example.h> #include <gtsam/3rdparty/ceres/example.h>
#include <gtsam_unstable/nonlinear/AdaptAutoDiff.h> #include <gtsam/nonlinear/AdaptAutoDiff.h>
#include <gtsam_unstable/nonlinear/ExpressionFactor.h> #include <gtsam_unstable/nonlinear/ExpressionFactor.h>
#include <gtsam/slam/GeneralSFMFactor.h> #include <gtsam/slam/GeneralSFMFactor.h>
#include <gtsam/geometry/PinholeCamera.h> #include <gtsam/geometry/PinholeCamera.h>