diff --git a/gtsam/base/Matrix.cpp b/gtsam/base/Matrix.cpp index adf98cf9a..7f44d43db 100644 --- a/gtsam/base/Matrix.cpp +++ b/gtsam/base/Matrix.cpp @@ -211,17 +211,6 @@ void transposeMultiplyAdd(double alpha, const Matrix& A, const Vector& e, SubVec x += alpha * A.transpose() * e; } -/* ************************************************************************* */ -Vector Vector_(const Matrix& A) -{ - size_t m = A.rows(), n = A.cols(); - Vector v(m*n); - for( size_t j = 0, k=0 ; j < n ; j++) - for( size_t i = 0; i < m ; i++,k++) - v(k) = A(i,j); - return v; -} - /* ************************************************************************* */ void print(const Matrix& A, const string &s, ostream& stream) { size_t m = A.rows(), n = A.cols(); diff --git a/gtsam/base/Matrix.h b/gtsam/base/Matrix.h index 05f3bc7c9..317698b3f 100644 --- a/gtsam/base/Matrix.h +++ b/gtsam/base/Matrix.h @@ -196,11 +196,6 @@ inline MATRIX prod(const MATRIX& A, const MATRIX&B) { return result; } -/** - * convert to column vector, column order !!! - */ -GTSAM_EXPORT Vector Vector_(const Matrix& A); - /** * print a matrix */ diff --git a/gtsam/base/Vector.cpp b/gtsam/base/Vector.cpp index 2a0192930..48ada018f 100644 --- a/gtsam/base/Vector.cpp +++ b/gtsam/base/Vector.cpp @@ -79,33 +79,6 @@ void odprintf(const char *format, ...) { //#endif } -/* ************************************************************************* */ -Vector Vector_( size_t m, const double* const data) { - Vector A(m); - copy(data, data+m, A.data()); - return A; -} - -/* ************************************************************************* */ -Vector Vector_(size_t m, ...) { - Vector v(m); - va_list ap; - va_start(ap, m); - for( size_t i = 0 ; i < m ; i++) { - double value = va_arg(ap, double); - v(i) = value; - } - va_end(ap); - return v; -} - -/* ************************************************************************* */ -Vector Vector_(const std::vector& d) { - Vector v(d.size()); - copy(d.begin(), d.end(), v.data()); - return v; -} - /* ************************************************************************* */ bool zero(const Vector& v) { bool result = true; diff --git a/gtsam/base/Vector.h b/gtsam/base/Vector.h index 2c6066042..b35afccdb 100644 --- a/gtsam/base/Vector.h +++ b/gtsam/base/Vector.h @@ -46,22 +46,6 @@ typedef Eigen::VectorBlock ConstSubVector; */ GTSAM_EXPORT void odprintf(const char *format, ...); -/** - * constructor with size and initial data, row order ! - */ -GTSAM_EXPORT Vector Vector_( size_t m, const double* const data); - -/** - * nice constructor, dangerous as number of arguments must be exactly right - * and you have to pass doubles !!! always use 0.0 never 0 - */ -GTSAM_EXPORT Vector Vector_(size_t m, ...); - -/** - * Create a numeric vector from an STL vector of doubles - */ -GTSAM_EXPORT Vector Vector_(const std::vector& data); - /** * Create vector initialized to a constant value * @param n is the size of the vector diff --git a/tests/testBoundingConstraint.cpp b/tests/testBoundingConstraint.cpp index b85b75d1c..7b5f31660 100644 --- a/tests/testBoundingConstraint.cpp +++ b/tests/testBoundingConstraint.cpp @@ -187,7 +187,7 @@ TEST( testBoundingConstraint, MaxDistance_basics) { EXPECT(!rangeBound.isGreaterThan()); EXPECT(rangeBound.dim() == 1); - EXPECT(assert_equal(Vector(1) << 2.0), rangeBound.evaluateError(pt1, pt1))); + EXPECT(assert_equal(((Vector)Vector(1) << 2.0), rangeBound.evaluateError(pt1, pt1))); EXPECT(assert_equal(ones(1), rangeBound.evaluateError(pt1, pt2))); EXPECT(assert_equal(zero(1), rangeBound.evaluateError(pt1, pt3))); EXPECT(assert_equal(-1.0*ones(1), rangeBound.evaluateError(pt1, pt4)));