12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename back to HybridJunctionTree

release/4.3a0
Varun Agrawal 2022-06-03 13:29:05 -04:00
parent b47cd9d97b
commit eeecb27f14
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam/hybrid/HybridBayesTree.cpp
View File

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

2
gtsam/hybrid/HybridBayesTree.h
View File

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

2
gtsam/hybrid/HybridGaussianFactorGraph.cpp
View File

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

4
gtsam/hybrid/HybridGaussianFactorGraph.h
View File

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

6
gtsam/hybrid/HybridGaussianJunctionTree.cpp → gtsam/hybrid/HybridJunctionTree.cpp
View File

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

8
gtsam/hybrid/HybridGaussianJunctionTree.h → gtsam/hybrid/HybridJunctionTree.h
View File

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