From 4c10be9808983c4c4533b780fecf503cefc4ddf9 Mon Sep 17 00:00:00 2001 From: lcarlone Date: Sat, 2 Oct 2021 21:12:46 -0400 Subject: [PATCH] fixed equal --- gtsam/slam/SmartProjectionRigFactor.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gtsam/slam/SmartProjectionRigFactor.h b/gtsam/slam/SmartProjectionRigFactor.h index 600e48e8d..07efd775c 100644 --- a/gtsam/slam/SmartProjectionRigFactor.h +++ b/gtsam/slam/SmartProjectionRigFactor.h @@ -58,13 +58,13 @@ class SmartProjectionRigFactor : public SmartProjectionFactor { protected: /// vector of keys (one for each observation) with potentially repeated keys - FastVector nonUniqueKeys_; + KeyVector nonUniqueKeys_; /// cameras in the rig (fixed poses wrt body + fixed intrinsics) typename Base::Cameras cameraRig_; /// vector of camera Ids (one for each observation), identifying which camera took the measurement - FastVector cameraIds_; + KeyVector cameraIds_; public: typedef CAMERA Camera; @@ -125,7 +125,7 @@ class SmartProjectionRigFactor : public SmartProjectionFactor { * @param poseKeys keys corresponding to the body poses of the cameras taking the measurements * @param cameraIds IDs of the cameras in the rig taking each measurement (same order as measurements) */ - void add(const Point2Vector& measurements, const FastVector& poseKeys, + void add(const Point2Vector& measurements, const KeyVector& poseKeys, const FastVector& cameraIds) { assert(poseKeys.size() == measurements.size()); assert(poseKeys.size() == cameraIds.size()); @@ -135,7 +135,7 @@ class SmartProjectionRigFactor : public SmartProjectionFactor { } /// return (for each observation) the (possibly non unique) keys involved in the measurements - const FastVector nonUniqueKeys() const { + const KeyVector nonUniqueKeys() const { return nonUniqueKeys_; } @@ -145,7 +145,7 @@ class SmartProjectionRigFactor : public SmartProjectionFactor { } /// return the calibration object - inline FastVector cameraIds() const { + inline KeyVector cameraIds() const { return cameraIds_; } @@ -171,8 +171,8 @@ class SmartProjectionRigFactor : public SmartProjectionFactor { const This *e = dynamic_cast(&p); return e && Base::equals(p, tol) && nonUniqueKeys_ == e->nonUniqueKeys() - && cameraRig_.equals(e->cameraRig()); -// && cameraIds_ == e->cameraIds(); + && cameraRig_.equals(e->cameraRig()) + && std::equal(cameraIds_.begin(), cameraIds_.end(), e->cameraIds().begin()); } /**