From 2b06c8ad3690b53d324b54712465675c538ca801 Mon Sep 17 00:00:00 2001 From: Natesh Srinivasan Date: Fri, 31 Jan 2014 10:43:54 -0500 Subject: [PATCH] Changes Symbol to Key in Prior Factor. Can remove "symbol.h" after Alex's Change --- gtsam/slam/OrientedPlane3Factor.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gtsam/slam/OrientedPlane3Factor.h b/gtsam/slam/OrientedPlane3Factor.h index d4d4f314c..7f19de2a5 100644 --- a/gtsam/slam/OrientedPlane3Factor.h +++ b/gtsam/slam/OrientedPlane3Factor.h @@ -11,6 +11,7 @@ #include #include #include +#include #include namespace gtsam { @@ -59,11 +60,12 @@ namespace gtsam { }; }; + // TODO: Convert this factor to dimension two, three dimensions is redundant for direction prior class OrientedPlane3DirectionPrior: public NoiseModelFactor1 { protected: OrientedPlane3 measured_p_; /// measured plane parameters - Symbol landmarkSymbol_; + Key landmarkSymbol_; typedef NoiseModelFactor1 Base; @@ -75,10 +77,10 @@ namespace gtsam { {} /// Constructor with measured plane coefficients (a,b,c,d), noise model, landmark symbol - OrientedPlane3DirectionPrior (const Symbol& landmark, const Vector&z, + OrientedPlane3DirectionPrior (Key key, const Vector&z, const SharedGaussian& noiseModel) - : Base (noiseModel, landmark), - landmarkSymbol_ (landmark) + : Base (noiseModel, key), + landmarkSymbol_ (key) { measured_p_ = OrientedPlane3 (Sphere2 (z (0), z (1), z (2)), z (3)); }