From c607f48a3cfa660f19e30c882f62ea7455148edd Mon Sep 17 00:00:00 2001 From: Mike Bosse Date: Sun, 21 Dec 2014 18:50:01 +0100 Subject: [PATCH] fixed some Point2 constructions --- gtsam/slam/tests/testGeneralSFMFactor.cpp | 2 +- gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp | 2 +- tests/smallExample.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtsam/slam/tests/testGeneralSFMFactor.cpp b/gtsam/slam/tests/testGeneralSFMFactor.cpp index 8adbaa62d..240b19a46 100644 --- a/gtsam/slam/tests/testGeneralSFMFactor.cpp +++ b/gtsam/slam/tests/testGeneralSFMFactor.cpp @@ -86,7 +86,7 @@ static const SharedNoiseModel sigma1(noiseModel::Unit::Create(2)); TEST( GeneralSFMFactor, equals ) { // Create two identical factors and make sure they're equal - Vector z = Vector2(323.,240.); + Point2 z(323.,240.); const Symbol cameraFrameNumber('x',1), landmarkNumber('l',1); const SharedNoiseModel sigma(noiseModel::Unit::Create(1)); boost::shared_ptr diff --git a/gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp b/gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp index 9cc634b37..df56f5260 100644 --- a/gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp +++ b/gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp @@ -86,7 +86,7 @@ static const SharedNoiseModel sigma1(noiseModel::Unit::Create(2)); TEST( GeneralSFMFactor_Cal3Bundler, equals ) { // Create two identical factors and make sure they're equal - Vector z = Vector2(323.,240.); + Point2 z(323.,240.); const Symbol cameraFrameNumber('x',1), landmarkNumber('l',1); const SharedNoiseModel sigma(noiseModel::Unit::Create(1)); boost::shared_ptr diff --git a/tests/smallExample.h b/tests/smallExample.h index b7cb7aefe..621ce52e3 100644 --- a/tests/smallExample.h +++ b/tests/smallExample.h @@ -349,7 +349,7 @@ inline boost::shared_ptr sharedReallyNonlinearFactor using symbol_shorthand::X; using symbol_shorthand::L; boost::shared_ptr fg(new NonlinearFactorGraph); - Vector z = Vector2(1.0, 0.0); + Vector2 z = Vector2(1.0, 0.0); double sigma = 0.1; boost::shared_ptr factor( new smallOptimize::UnaryFactor(z, noiseModel::Isotropic::Sigma(2,sigma), X(1)));