Skip to content

Commit

Permalink
rename back to HybridJunctionTree
Browse files Browse the repository at this point in the history
  • Loading branch information
varunagrawal committed Jun 3, 2022
1 parent b47cd9d commit eeecb27
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion gtsam/hybrid/HybridBayesTree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
2 changes: 1 addition & 1 deletion gtsam/hybrid/HybridBayesTree.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
2 changes: 1 addition & 1 deletion gtsam/hybrid/HybridGaussianFactorGraph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions gtsam/hybrid/HybridGaussianFactorGraph.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class HybridConditional;
class HybridBayesNet;
class HybridEliminationTree;
class HybridBayesTree;
class HybridGaussianJunctionTree;
class HybridJunctionTree;
class DecisionTreeFactor;

class JacobianFactor;
Expand All @@ -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>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* -------------------------------------------------------------------------- */

/**
* @file HybridGaussianJunctionTree.h
* @file HybridJunctionTree.h
* @date Mar 11, 2022
* @author Fan Jiang
*/
Expand Down Expand Up @@ -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

/**
Expand All @@ -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

0 comments on commit eeecb27

Please sign in to comment.