diff --git a/gtsam_unstable/base/FixedVector.h b/gtsam_unstable/base/FixedVector.h index 53a9190ce..6df24fb4f 100644 --- a/gtsam_unstable/base/FixedVector.h +++ b/gtsam_unstable/base/FixedVector.h @@ -52,6 +52,7 @@ public: * NOTE: this will throw warnings/explode if there is no argument * before the variadic section, so there is a meaningless size argument. */ + /* FixedVector(size_t n, ...) { va_list ap; va_start(ap, n); @@ -61,7 +62,7 @@ public: } va_end(ap); } - + */ /** * Create vector initialized to a constant value * @param value constant value diff --git a/gtsam_unstable/base/tests/testFixedVector.cpp b/gtsam_unstable/base/tests/testFixedVector.cpp index 54452e2c4..e5e297b7c 100644 --- a/gtsam_unstable/base/tests/testFixedVector.cpp +++ b/gtsam_unstable/base/tests/testFixedVector.cpp @@ -37,7 +37,7 @@ TEST( testFixedVector, conversions ) { /* ************************************************************************* */ TEST( testFixedVector, variable_constructor ) { - TestVector3 act(3, 1.0, 2.0, 3.0); + TestVector3 act((Vector(3) << 1.0, 2.0, 3.0)); EXPECT_DOUBLES_EQUAL(1.0, act(0), tol); EXPECT_DOUBLES_EQUAL(2.0, act(1), tol); EXPECT_DOUBLES_EQUAL(3.0, act(2), tol); @@ -45,8 +45,9 @@ TEST( testFixedVector, variable_constructor ) { /* ************************************************************************* */ TEST( testFixedVector, equals ) { - TestVector3 vec1(3, 1.0, 2.0, 3.0), vec2(3, 1.0, 2.0, 3.0), vec3(3, 2.0, 3.0, 4.0); - TestVector5 vec4(5, 1.0, 2.0, 3.0, 4.0, 5.0); + TestVector3 vec1((Vector(3) << 1.0, 2.0, 3.0)), vec2((Vector(3) << 1.0, 2.0, 3.0)), + vec3((Vector(3) << 2.0, 3.0, 4.0)); + TestVector5 vec4((Vector(5) << 1.0, 2.0, 3.0, 4.0, 5.0)); EXPECT(assert_equal(vec1, vec1, tol)); EXPECT(assert_equal(vec1, vec2, tol)); @@ -60,23 +61,23 @@ TEST( testFixedVector, equals ) { /* ************************************************************************* */ TEST( testFixedVector, static_constructors ) { TestVector3 actZero = TestVector3::zero(); - TestVector3 expZero(3, 0.0, 0.0, 0.0); + TestVector3 expZero((Vector(3) << 0.0, 0.0, 0.0)); EXPECT(assert_equal(expZero, actZero, tol)); TestVector3 actOnes = TestVector3::ones(); - TestVector3 expOnes(3, 1.0, 1.0, 1.0); + TestVector3 expOnes((Vector(3) << 1.0, 1.0, 1.0)); EXPECT(assert_equal(expOnes, actOnes, tol)); TestVector3 actRepeat = TestVector3::repeat(2.3); - TestVector3 expRepeat(3, 2.3, 2.3, 2.3); + TestVector3 expRepeat((Vector(3) << 2.3, 2.3, 2.3)); EXPECT(assert_equal(expRepeat, actRepeat, tol)); TestVector3 actBasis = TestVector3::basis(1); - TestVector3 expBasis(3, 0.0, 1.0, 0.0); + TestVector3 expBasis((Vector(3) << 0.0, 1.0, 0.0)); EXPECT(assert_equal(expBasis, actBasis, tol)); TestVector3 actDelta = TestVector3::delta(1, 2.3); - TestVector3 expDelta(3, 0.0, 2.3, 0.0); + TestVector3 expDelta((Vector(3) << 0.0, 2.3, 0.0)); EXPECT(assert_equal(expDelta, actDelta, tol)); }