diff --git a/gtsam/geometry/Cal3Unified.cpp b/gtsam/geometry/Cal3Unified.cpp index d2a2be287..39ad221cb 100644 --- a/gtsam/geometry/Cal3Unified.cpp +++ b/gtsam/geometry/Cal3Unified.cpp @@ -28,11 +28,6 @@ namespace gtsam { Cal3Unified::Cal3Unified(const Vector &v): Base(v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8]), xi_(v[9]) {} -/* ************************************************************************* */ -Matrix Cal3Unified::K() const { - return Base::K(); -} - /* ************************************************************************* */ Vector Cal3Unified::vector() const { return (Vector(10) << Base::vector(), xi_); diff --git a/gtsam/geometry/Cal3Unified.h b/gtsam/geometry/Cal3Unified.h index d8c0251f0..6961757bd 100644 --- a/gtsam/geometry/Cal3Unified.h +++ b/gtsam/geometry/Cal3Unified.h @@ -32,7 +32,7 @@ namespace gtsam { * @addtogroup geometry * \nosubgrouping */ -class GTSAM_EXPORT Cal3Unified : protected Cal3DS2 { +class GTSAM_EXPORT Cal3Unified : public Cal3DS2 { typedef Cal3Unified This; typedef Cal3DS2 Base; @@ -49,8 +49,8 @@ private: // pi = K*pn public: - Matrix K() const ; - Eigen::Vector4d k() const { return Base::k(); } + //Matrix K() const ; + //Eigen::Vector4d k() const { return Base::k(); } Vector vector() const ; /// @name Standard Constructors @@ -86,21 +86,6 @@ public: /// mirror parameter inline double xi() const { return xi_;} - /// focal length x - inline double fx() const { return fx_;} - - /// focal length y - inline double fy() const { return fy_;} - - /// skew - inline double skew() const { return s_;} - - /// image center in x - inline double px() const { return u0_;} - - /// image center in y - inline double py() const { return v0_;} - /** * convert intrinsic coordinates xy to image coordinates uv * @param p point in intrinsic coordinates @@ -149,20 +134,10 @@ private: void serialize(Archive & ar, const unsigned int version) { ar & boost::serialization::make_nvp("Cal3Unified", - boost::serialization::base_object(*this)); - ar & BOOST_SERIALIZATION_NVP(fx_); - ar & BOOST_SERIALIZATION_NVP(fy_); - ar & BOOST_SERIALIZATION_NVP(s_); - ar & BOOST_SERIALIZATION_NVP(u0_); - ar & BOOST_SERIALIZATION_NVP(v0_); - ar & BOOST_SERIALIZATION_NVP(k1_); - ar & BOOST_SERIALIZATION_NVP(k2_); - ar & BOOST_SERIALIZATION_NVP(k3_); - ar & BOOST_SERIALIZATION_NVP(k4_); + boost::serialization::base_object(*this)); ar & BOOST_SERIALIZATION_NVP(xi_); } - /// @} }; diff --git a/gtsam/geometry/tests/testCal3Unify.cpp b/gtsam/geometry/tests/testCal3Unified.cpp similarity index 100% rename from gtsam/geometry/tests/testCal3Unify.cpp rename to gtsam/geometry/tests/testCal3Unified.cpp