From 1114509e9807a62751ef841e9427e0b48b456608 Mon Sep 17 00:00:00 2001 From: dellaert Date: Sat, 21 Feb 2015 11:05:43 +0100 Subject: [PATCH] Switch order of two range functions --- gtsam/geometry/PinholePose.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gtsam/geometry/PinholePose.h b/gtsam/geometry/PinholePose.h index 2fc463d2b..5a3b002a1 100644 --- a/gtsam/geometry/PinholePose.h +++ b/gtsam/geometry/PinholePose.h @@ -144,7 +144,21 @@ public: } /** - * Calculate range to another camera + * Calculate range to a CalibratedCamera + * @param camera Other camera + * @param Dcamera the optionally computed Jacobian with respect to pose + * @param Dother the optionally computed Jacobian with respect to the other camera + * @return range (double) + */ + double range( + const CalibratedCamera& camera, // + OptionalJacobian<1, 6> Dcamera = boost::none, + OptionalJacobian<1, 6> Dother = boost::none) const { + return pose().range(camera.pose(), Dcamera, Dother); + } + + /** + * Calculate range to a PinholePoseK derived class * @param camera Other camera * @param Dcamera the optionally computed Jacobian with respect to pose * @param Dother the optionally computed Jacobian with respect to the other camera @@ -158,20 +172,6 @@ public: return pose().range(camera.pose(), Dcamera, Dother); } - /** - * Calculate range to another camera - * @param camera Other camera - * @param Dcamera the optionally computed Jacobian with respect to pose - * @param Dother the optionally computed Jacobian with respect to the other camera - * @return range (double) - */ - double range( - const CalibratedCamera& camera, // - OptionalJacobian<1, 6> Dcamera = boost::none, - OptionalJacobian<1, 6> Dother = boost::none) const { - return pose().range(camera.pose(), Dcamera, Dother); - } - private: /** Serialization function */