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

Enable typedef for Jenkins testing

release/4.3a0
dellaert 2016-02-12 00:05:25 -08:00
parent 56dbf487ee
commit fe1607c464
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtsam/geometry/Point3.h
View File

@ -28,10 +28,11 @@
namespace gtsam { namespace gtsam {
//#define GTSAM_USE_VECTOR3_POINTS #define GTSAM_USE_VECTOR3_POINTS
#ifdef GTSAM_USE_VECTOR3_POINTS #ifdef GTSAM_USE_VECTOR3_POINTS
// As of GTSAM4, we just typedef Point3 to Vector3 /// As of GTSAM 4, in order to make GTSAM more lean,
/// it is now possible to just typedef Point3 to Vector3
typedef Vector3 Point3; typedef Vector3 Point3;
#else #else
@ -51,13 +52,10 @@ class GTSAM_EXPORT Point3 : public Vector3 {
/// @{ /// @{
#ifndef GTSAM_ALLOW_DEPRECATED_SINCE_V4 #ifndef GTSAM_ALLOW_DEPRECATED_SINCE_V4
/// Default constructor now creates *uninitialized* point !!!! /// Default constructor no longer initializes, just like Vector3
Point3() { Point3() {}
throw std::runtime_error("Default constructor called!");
}
#endif #endif
/// Construct from x, y, and z coordinates /// Construct from x, y, and z coordinates
Point3(double x, double y, double z): Vector3(x,y, z) {} Point3(double x, double y, double z): Vector3(x,y, z) {}
@ -111,11 +109,6 @@ class GTSAM_EXPORT Point3 : public Vector3 {
/// return as Vector3 /// return as Vector3
const Vector3& vector() const { return *this; } const Vector3& vector() const { return *this; }
/// return as transposed vector
Eigen::DenseBase<Vector3>::ConstTransposeReturnType transpose() const {
return this->Vector3::transpose();
}
/// @} /// @}
/// Output stream operator /// Output stream operator
@ -124,7 +117,7 @@ class GTSAM_EXPORT Point3 : public Vector3 {
#ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V4 #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V4
/// @name Deprecated /// @name Deprecated
/// @{ /// @{
Point3() { setZero(); } Point3() { setZero(); } // initializes to zero, in contrast to new behavior
Point3 inverse() const { return -(*this);} Point3 inverse() const { return -(*this);}
Point3 compose(const Point3& q) const { return (*this)+q;} Point3 compose(const Point3& q) const { return (*this)+q;}
Point3 between(const Point3& q) const { return q-(*this);} Point3 between(const Point3& q) const { return q-(*this);}