From eeecb27f14aca16f38c46821f5a5f2f16a512ef9 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Fri, 3 Jun 2022 13:29:05 -0400
Subject: [PATCH] rename back to HybridJunctionTree

---
 gtsam/hybrid/HybridBayesTree.cpp                          | 2 +-
 gtsam/hybrid/HybridBayesTree.h                            | 2 +-
 gtsam/hybrid/HybridGaussianFactorGraph.cpp                | 2 +-
 gtsam/hybrid/HybridGaussianFactorGraph.h                  | 4 ++--
 ...ridGaussianJunctionTree.cpp => HybridJunctionTree.cpp} | 6 +++---
 ...{HybridGaussianJunctionTree.h => HybridJunctionTree.h} | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename gtsam/hybrid/{HybridGaussianJunctionTree.cpp => HybridJunctionTree.cpp} (97%)
 rename gtsam/hybrid/{HybridGaussianJunctionTree.h => HybridJunctionTree.h} (91%)

diff --git a/gtsam/hybrid/HybridBayesTree.cpp b/gtsam/hybrid/HybridBayesTree.cpp
index ff07f1817..d65270f91 100644
--- a/gtsam/hybrid/HybridBayesTree.cpp
+++ b/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
  */
diff --git a/gtsam/hybrid/HybridBayesTree.h b/gtsam/hybrid/HybridBayesTree.h
index 28d9ef809..0b89ca8c4 100644
--- a/gtsam/hybrid/HybridBayesTree.h
+++ b/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
  */
diff --git a/gtsam/hybrid/HybridGaussianFactorGraph.cpp b/gtsam/hybrid/HybridGaussianFactorGraph.cpp
index c1251309c..88730cae9 100644
--- a/gtsam/hybrid/HybridGaussianFactorGraph.cpp
+++ b/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>
diff --git a/gtsam/hybrid/HybridGaussianFactorGraph.h b/gtsam/hybrid/HybridGaussianFactorGraph.h
index e7dc3dfca..0188aa652 100644
--- a/gtsam/hybrid/HybridGaussianFactorGraph.h
+++ b/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>,
diff --git a/gtsam/hybrid/HybridGaussianJunctionTree.cpp b/gtsam/hybrid/HybridJunctionTree.cpp
similarity index 97%
rename from gtsam/hybrid/HybridGaussianJunctionTree.cpp
rename to gtsam/hybrid/HybridJunctionTree.cpp
index 8ceb7c87b..7725742cf 100644
--- a/gtsam/hybrid/HybridGaussianJunctionTree.cpp
+++ b/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,
diff --git a/gtsam/hybrid/HybridGaussianJunctionTree.h b/gtsam/hybrid/HybridJunctionTree.h
similarity index 91%
rename from gtsam/hybrid/HybridGaussianJunctionTree.h
rename to gtsam/hybrid/HybridJunctionTree.h
index 314e7daa6..cad1e15a1 100644
--- a/gtsam/hybrid/HybridGaussianJunctionTree.h
+++ b/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