From c0fb1abaf08c6b2ff82d25540f2f85a952fd7065 Mon Sep 17 00:00:00 2001 From: Alex Hagiopol Date: Fri, 11 Mar 2016 14:00:04 -0500 Subject: [PATCH] Deprecated max() in Vector.h. --- gtsam/base/Vector.cpp | 5 ----- gtsam/base/Vector.h | 8 +------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/gtsam/base/Vector.cpp b/gtsam/base/Vector.cpp index a9a0efa36..39b61a4cb 100644 --- a/gtsam/base/Vector.cpp +++ b/gtsam/base/Vector.cpp @@ -219,11 +219,6 @@ Vector abs(const Vector& v) { return v.cwiseAbs(); } -/* ************************************************************************* */ -double max(const Vector &a) { - return a.maxCoeff(); -} - /* ************************************************************************* */ // imperative version, pass in x double houseInPlace(Vector &v) { diff --git a/gtsam/base/Vector.h b/gtsam/base/Vector.h index 7e9214789..63ca92799 100644 --- a/gtsam/base/Vector.h +++ b/gtsam/base/Vector.h @@ -250,13 +250,6 @@ GTSAM_EXPORT Vector esqrt(const Vector& v); */ GTSAM_EXPORT Vector abs(const Vector& v); -/** - * Return the max element of a vector - * @param a is a vector - * @return max(a) - */ -GTSAM_EXPORT double max(const Vector &a); - /** * Dot product */ @@ -337,6 +330,7 @@ GTSAM_EXPORT Vector concatVectors(size_t nrVectors, ...); GTSAM_EXPORT inline Vector emul(const Vector &a, const Vector &b) {assert (b.size()==a.size()); return a.cwiseProduct(b);} 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