diff --git a/gtsam/base/Vector.cpp b/gtsam/base/Vector.cpp index 39b61a4cb..390609917 100644 --- a/gtsam/base/Vector.cpp +++ b/gtsam/base/Vector.cpp @@ -214,11 +214,6 @@ Vector esqrt(const Vector& v) { return v.cwiseSqrt(); } -/* ************************************************************************* */ -Vector abs(const Vector& v) { - return v.cwiseAbs(); -} - /* ************************************************************************* */ // imperative version, pass in x double houseInPlace(Vector &v) { diff --git a/gtsam/base/Vector.h b/gtsam/base/Vector.h index 63ca92799..ea7ab08cf 100644 --- a/gtsam/base/Vector.h +++ b/gtsam/base/Vector.h @@ -243,13 +243,6 @@ GTSAM_EXPORT double norm_2(const Vector& v); */ GTSAM_EXPORT Vector esqrt(const Vector& v); -/** - * Absolute values of vector elements - * @param v is a vector - * @return [abs(a(i))] - */ -GTSAM_EXPORT Vector abs(const Vector& v); - /** * Dot product */ @@ -327,10 +320,11 @@ GTSAM_EXPORT Vector concatVectors(const std::list& vs); GTSAM_EXPORT Vector concatVectors(size_t nrVectors, ...); #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V4 +GTSAM_EXPORT inline Vector abs(const Vector& v){return v.cwiseAbs();} GTSAM_EXPORT inline Vector emul(const Vector &a, const Vector &b) {assert (b.size()==a.size()); return a.cwiseProduct(b);} +GTSAM_EXPORT inline double max(const Vector &a){return a.maxCoeff();} GTSAM_EXPORT inline Vector reciprocal(const Vector &a) {return a.array().inverse();} GTSAM_EXPORT inline double sum(const Vector &a){return a.sum();} -GTSAM_EXPORT inline double max(const Vector &a){return a.maxCoeff();} #endif } // namespace gtsam