From 6504e0e692db1d6fe41ffbb370eb28244bc8dce2 Mon Sep 17 00:00:00 2001
From: Alex Hagiopol <alexhagiopol@gmail.com>
Date: Fri, 11 Mar 2016 19:49:03 -0500
Subject: [PATCH] Deprecated ediv() in Vector.h.

---
 gtsam/base/Vector.cpp           | 6 ------
 gtsam/base/Vector.h             | 9 +--------
 gtsam/base/tests/testVector.cpp | 2 +-
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/gtsam/base/Vector.cpp b/gtsam/base/Vector.cpp
index 4095cc693..d3c39eeda 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 ediv(const Vector &a, const Vector &b) {
-  assert (b.size()==a.size());
-  return a.cwiseQuotient(b);
-}
-
 /* ************************************************************************* */
 Vector ediv_(const Vector &a, const Vector &b) {
   size_t n = a.size();
diff --git a/gtsam/base/Vector.h b/gtsam/base/Vector.h
index 0b825bcfb..4c2f5e3fa 100644
--- a/gtsam/base/Vector.h
+++ b/gtsam/base/Vector.h
@@ -212,14 +212,6 @@ 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);
 
-/**
- * elementwise division
- * @param a first vector
- * @param b second vector
- * @return vector [a(i)/b(i)]
- */
-GTSAM_EXPORT Vector ediv(const Vector &a, const Vector &b);
-
 /**
  * elementwise division, but 0/0 = 0, not inf
  * @param a first vector
@@ -306,6 +298,7 @@ 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 Vector ediv(const Vector &a, const Vector &b) {assert (b.size()==a.size()); return a.cwiseQuotient(b);}
 GTSAM_EXPORT inline Vector esqrt(const Vector& v) { return v.cwiseSqrt();}
 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();}
diff --git a/gtsam/base/tests/testVector.cpp b/gtsam/base/tests/testVector.cpp
index a2620ef0c..718ce9c80 100644
--- a/gtsam/base/tests/testVector.cpp
+++ b/gtsam/base/tests/testVector.cpp
@@ -257,7 +257,7 @@ TEST(Vector, ediv )
 {
   Vector a = Vector3(10., 20., 30.);
   Vector b = Vector3(2.0, 5.0, 6.0);
-  Vector actual(ediv(a,b));
+  Vector actual(a.cwiseQuotient(b));
 
   Vector c = Vector3(5.0, 4.0, 5.0);
   EXPECT(assert_equal(c,actual));