Merge branch 'develop' into hybrid/pruning

gtsam/geometry/Rot3.cpp

@@ -292,8 +292,8 @@ pair<Matrix3, Vector3> RQ(const Matrix3& A, OptionalJacobian<3, 9> H) {
     (*H)(1, 8) = yHb22 * cx;
 
     // Next, calculate the derivate of z. We have
-    // c20 = a10 * cy + a11 * sx * sy + a12 * cx * sy
-    // c22 = a11 * cx - a12 * sx
+    // c10 = a10 * cy + a11 * sx * sy + a12 * cx * sy
+    // c11 = a11 * cx - a12 * sx
     const auto c10Hx = (A(1, 1) * cx - A(1, 2) * sx) * sy;
     const auto c10Hy = A(1, 2) * cx * cy + A(1, 1) * cy * sx - A(1, 0) * sy;
     Vector9 c10HA = c10Hx * H->row(0) + c10Hy * H->row(1);

gtsam/geometry/geometry.i

@@ -873,7 +873,7 @@ template <CALIBRATION>
 class PinholeCamera {
   // Standard Constructors and Named Constructors
   PinholeCamera();
-  PinholeCamera(const gtsam::PinholeCamera<CALIBRATION> other);
+  PinholeCamera(const This other);
   PinholeCamera(const gtsam::Pose3& pose);
   PinholeCamera(const gtsam::Pose3& pose, const CALIBRATION& K);
   static This Level(const CALIBRATION& K, const gtsam::Pose2& pose,
@@ -942,7 +942,7 @@ template <CALIBRATION>
 class PinholePose {
   // Standard Constructors and Named Constructors
   PinholePose();
-  PinholePose(const gtsam::PinholePose<CALIBRATION> other);
+  PinholePose(const This other);
   PinholePose(const gtsam::Pose3& pose);
   PinholePose(const gtsam::Pose3& pose, const CALIBRATION* K);
   static This Level(const gtsam::Pose2& pose, double height);

gtsam/hybrid/HybridBayesTree.cpp

@@ -12,7 +12,7 @@
 /**
  * @file    HybridBayesTree.cpp
  * @brief   Hybrid Bayes Tree, the result of eliminating a
- * HybridGaussianJunctionTree
+ * HybridJunctionTree
  * @date Mar 11, 2022
  * @author  Fan Jiang
  */

gtsam/hybrid/HybridBayesTree.h

@@ -12,7 +12,7 @@
 /**
  * @file    HybridBayesTree.h
  * @brief   Hybrid Bayes Tree, the result of eliminating a
- * HybridGaussianJunctionTree
+ * HybridJunctionTree
  * @date Mar 11, 2022
  * @author  Fan Jiang
  */

gtsam/hybrid/HybridGaussianFactorGraph.cpp

@@ -31,7 +31,7 @@
 #include <gtsam/hybrid/HybridFactor.h>
 #include <gtsam/hybrid/HybridGaussianFactor.h>
 #include <gtsam/hybrid/HybridGaussianFactorGraph.h>
-#include <gtsam/hybrid/HybridGaussianJunctionTree.h>
+#include <gtsam/hybrid/HybridJunctionTree.h>
 #include <gtsam/inference/EliminateableFactorGraph-inst.h>
 #include <gtsam/inference/Key.h>
 #include <gtsam/linear/GaussianConditional.h>

gtsam/hybrid/HybridGaussianFactorGraph.h

@@ -31,7 +31,7 @@ class HybridConditional;
 class HybridBayesNet;
 class HybridEliminationTree;
 class HybridBayesTree;
-class HybridGaussianJunctionTree;
+class HybridJunctionTree;
 class DecisionTreeFactor;
 
 class JacobianFactor;
@@ -55,7 +55,7 @@ struct EliminationTraits<HybridGaussianFactorGraph> {
   typedef HybridEliminationTree
       EliminationTreeType;                ///< Type of elimination tree
   typedef HybridBayesTree BayesTreeType;  ///< Type of Bayes tree
-  typedef HybridGaussianJunctionTree
+  typedef HybridJunctionTree
       JunctionTreeType;  ///< Type of Junction tree
   /// The default dense elimination function
   static std::pair<boost::shared_ptr<ConditionalType>,

gtsam/hybrid/HybridJunctionTree.cpp

@@ -10,14 +10,14 @@
  * -------------------------------------------------------------------------- */
 
 /**
- * @file HybridGaussianJunctionTree.cpp
+ * @file HybridJunctionTree.cpp
  * @date Mar 11, 2022
  * @author Fan Jiang
  */
 
 #include <gtsam/hybrid/HybridEliminationTree.h>
 #include <gtsam/hybrid/HybridGaussianFactorGraph.h>
-#include <gtsam/hybrid/HybridGaussianJunctionTree.h>
+#include <gtsam/hybrid/HybridJunctionTree.h>
 #include <gtsam/inference/JunctionTree-inst.h>
 #include <gtsam/inference/Key.h>
 
@@ -142,7 +142,7 @@ struct HybridConstructorTraversalData {
 };
 
 /* ************************************************************************* */
-HybridGaussianJunctionTree::HybridGaussianJunctionTree(
+HybridJunctionTree::HybridJunctionTree(
     const HybridEliminationTree& eliminationTree) {
   gttic(JunctionTree_FromEliminationTree);
   // Here we rely on the BayesNet having been produced by this elimination tree,

gtsam/hybrid/HybridJunctionTree.h

@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------------- */
 
 /**
- * @file HybridGaussianJunctionTree.h
+ * @file HybridJunctionTree.h
  * @date Mar 11, 2022
  * @author Fan Jiang
  */
@@ -48,12 +48,12 @@ class HybridEliminationTree;
  * \addtogroup Multifrontal
  * \nosubgrouping
  */
-class GTSAM_EXPORT HybridGaussianJunctionTree
+class GTSAM_EXPORT HybridJunctionTree
     : public JunctionTree<HybridBayesTree, HybridGaussianFactorGraph> {
  public:
   typedef JunctionTree<HybridBayesTree, HybridGaussianFactorGraph>
       Base;                                    ///< Base class
-  typedef HybridGaussianJunctionTree This;     ///< This class
+  typedef HybridJunctionTree This;     ///< This class
   typedef boost::shared_ptr<This> shared_ptr;  ///< Shared pointer to this class
 
   /**
@@ -65,7 +65,7 @@ class GTSAM_EXPORT HybridGaussianJunctionTree
    * named constructor instead.
    * @return The elimination tree
    */
-  HybridGaussianJunctionTree(const HybridEliminationTree& eliminationTree);
+  HybridJunctionTree(const HybridEliminationTree& eliminationTree);
 };
 
 }  // namespace gtsam