diff --git a/gtsam/base/tests/testMatrix.cpp b/gtsam/base/tests/testMatrix.cpp index 34502ba99..828208361 100644 --- a/gtsam/base/tests/testMatrix.cpp +++ b/gtsam/base/tests/testMatrix.cpp @@ -43,18 +43,6 @@ TEST( matrix, constructor_data ) EQUALITY(A,B); } -/* ************************************************************************* */ -/* -TEST( matrix, constructor_vector ) -{ - double data[] = { -5, 3, 0, -5 }; - Matrix A = Matrix_(2, 2, -5, 3, 0, -5); - Vector v(4); - copy(data, data + 4, v.data()); - Matrix B = Matrix_(2, 2, v); // this one is column order ! - EQUALITY(A,trans(B)); -} -*/ /* ************************************************************************* */ TEST( matrix, Matrix_ ) { diff --git a/gtsam/base/tests/testVector.cpp b/gtsam/base/tests/testVector.cpp index 7d7fc78bc..ee0d94366 100644 --- a/gtsam/base/tests/testVector.cpp +++ b/gtsam/base/tests/testVector.cpp @@ -23,16 +23,6 @@ using namespace std; using namespace gtsam; -/* ************************************************************************* */ -/* -TEST( TestVector, Vector_variants ) -{ - Vector a = (Vector(2) << 10.0,20.0); - double data[] = {10,20}; - Vector b = Vector_(2, data); - EXPECT(assert_equal(a, b)); -} -*/ namespace { /* ************************************************************************* */ template diff --git a/gtsam/linear/VectorValues.h b/gtsam/linear/VectorValues.h index a2f078ee2..502d9314b 100644 --- a/gtsam/linear/VectorValues.h +++ b/gtsam/linear/VectorValues.h @@ -49,15 +49,15 @@ namespace gtsam { * Example: * \code VectorValues values; - values.insert(3, Vector_(3, 1.0, 2.0, 3.0)); - values.insert(4, Vector_(2, 4.0, 5.0)); - values.insert(0, Vector_(4, 6.0, 7.0, 8.0, 9.0)); + values.insert(3, (Vector(3) << 1.0, 2.0, 3.0)); + values.insert(4, (Vector(2) << 4.0, 5.0)); + values.insert(0, (Vector(4) << 6.0, 7.0, 8.0, 9.0)); // Prints [ 3.0 4.0 ] gtsam::print(values[1]); // Prints [ 8.0 9.0 ] - values[1] = Vector_(2, 8.0, 9.0); + values[1] = (Vector(2) << 8.0, 9.0); gtsam::print(values[1]); \endcode *