From d7add67855631b96b57d4e176db3cea9c95774aa Mon Sep 17 00:00:00 2001 From: Alex Hagiopol Date: Sat, 5 Mar 2016 21:51:44 -0500 Subject: [PATCH] Moved deprecated implementation of emul() to Vector.h. --- gtsam/base/Vector.cpp | 6 ------ gtsam/base/Vector.h | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gtsam/base/Vector.cpp b/gtsam/base/Vector.cpp index 61a42fead..205f48839 100644 --- a/gtsam/base/Vector.cpp +++ b/gtsam/base/Vector.cpp @@ -186,12 +186,6 @@ void subInsert(Vector& fullVector, const Vector& subVector, size_t i) { fullVector.segment(i, subVector.size()) = subVector; } -/* ************************************************************************* */ -Vector emul(const Vector &a, const Vector &b) { - assert (b.size()==a.size()); - return a.cwiseProduct(b); -} - /* ************************************************************************* */ Vector ediv(const Vector &a, const Vector &b) { assert (b.size()==a.size()); diff --git a/gtsam/base/Vector.h b/gtsam/base/Vector.h index d7994da83..3d8c09d1e 100644 --- a/gtsam/base/Vector.h +++ b/gtsam/base/Vector.h @@ -213,7 +213,7 @@ GTSAM_EXPORT ConstSubVector sub(const Vector &v, size_t i1, size_t i2); GTSAM_EXPORT void subInsert(Vector& fullVector, const Vector& subVector, size_t i); #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V4 -GTSAM_EXPORT Vector emul(const Vector &a, const Vector &b); +GTSAM_EXPORT inline Vector emul(const Vector &a, const Vector &b) {assert (b.size()==a.size()); return a.cwiseProduct(b);} #endif /**