12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deprecated ediv() in Vector.h.

release/4.3a0
Alex Hagiopol 2016-03-11 19:49:03 -05:00
parent 5502691022
commit 6504e0e692
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtsam/base/Vector.cpp
View File

@ -186,12 +186,6 @@ void subInsert(Vector& fullVector, const Vector& subVector, size_t i) {
fullVector.segment(i, subVector.size()) = subVector; 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) { Vector ediv_(const Vector &a, const Vector &b) {
size_t n = a.size(); size_t n = a.size();

9
gtsam/base/Vector.h
View File

@ -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); 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 * elementwise division, but 0/0 = 0, not inf
* @param a first vector * @param a first vector
@ -306,6 +298,7 @@ GTSAM_EXPORT Vector concatVectors(size_t nrVectors, ...);
#ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V4 #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V4
GTSAM_EXPORT inline Vector abs(const Vector& v){return v.cwiseAbs();} 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 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 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 double max(const Vector &a){return a.maxCoeff();}

2
gtsam/base/tests/testVector.cpp
View File

@ -257,7 +257,7 @@ TEST(Vector, ediv )
{ {
Vector a = Vector3(10., 20., 30.); Vector a = Vector3(10., 20., 30.);
Vector b = Vector3(2.0, 5.0, 6.0); 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); Vector c = Vector3(5.0, 4.0, 5.0);
EXPECT(assert_equal(c,actual)); EXPECT(assert_equal(c,actual));