remove all Vector_() definition and declaration
parent
97ebfbb1f0
commit
b36574f77a
|
@ -211,17 +211,6 @@ void transposeMultiplyAdd(double alpha, const Matrix& A, const Vector& e, SubVec
|
||||||
x += alpha * A.transpose() * e;
|
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) {
|
void print(const Matrix& A, const string &s, ostream& stream) {
|
||||||
size_t m = A.rows(), n = A.cols();
|
size_t m = A.rows(), n = A.cols();
|
||||||
|
|
|
@ -196,11 +196,6 @@ inline MATRIX prod(const MATRIX& A, const MATRIX&B) {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* convert to column vector, column order !!!
|
|
||||||
*/
|
|
||||||
GTSAM_EXPORT Vector Vector_(const Matrix& A);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* print a matrix
|
* print a matrix
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -79,33 +79,6 @@ void odprintf(const char *format, ...) {
|
||||||
//#endif
|
//#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<double>& d) {
|
|
||||||
Vector v(d.size());
|
|
||||||
copy(d.begin(), d.end(), v.data());
|
|
||||||
return v;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
bool zero(const Vector& v) {
|
bool zero(const Vector& v) {
|
||||||
bool result = true;
|
bool result = true;
|
||||||
|
|
|
@ -46,22 +46,6 @@ typedef Eigen::VectorBlock<const Vector> ConstSubVector;
|
||||||
*/
|
*/
|
||||||
GTSAM_EXPORT void odprintf(const char *format, ...);
|
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<double>& data);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create vector initialized to a constant value
|
* Create vector initialized to a constant value
|
||||||
* @param n is the size of the vector
|
* @param n is the size of the vector
|
||||||
|
|
|
@ -187,7 +187,7 @@ TEST( testBoundingConstraint, MaxDistance_basics) {
|
||||||
EXPECT(!rangeBound.isGreaterThan());
|
EXPECT(!rangeBound.isGreaterThan());
|
||||||
EXPECT(rangeBound.dim() == 1);
|
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(ones(1), rangeBound.evaluateError(pt1, pt2)));
|
||||||
EXPECT(assert_equal(zero(1), rangeBound.evaluateError(pt1, pt3)));
|
EXPECT(assert_equal(zero(1), rangeBound.evaluateError(pt1, pt3)));
|
||||||
EXPECT(assert_equal(-1.0*ones(1), rangeBound.evaluateError(pt1, pt4)));
|
EXPECT(assert_equal(-1.0*ones(1), rangeBound.evaluateError(pt1, pt4)));
|
||||||
|
|
Loading…
Reference in New Issue