some cleanup based on previous commit
parent
e6b6528521
commit
f85284afb2
|
@ -51,6 +51,7 @@ namespace gtsam {
|
||||||
typedef std::shared_ptr<DecisionTreeFactor> shared_ptr;
|
typedef std::shared_ptr<DecisionTreeFactor> shared_ptr;
|
||||||
typedef AlgebraicDecisionTree<Key> ADT;
|
typedef AlgebraicDecisionTree<Key> ADT;
|
||||||
|
|
||||||
|
// Needed since we have definitions in both DiscreteFactor and DecisionTree
|
||||||
using Base::Binary;
|
using Base::Binary;
|
||||||
using Base::Unary;
|
using Base::Unary;
|
||||||
using Base::UnaryAssignment;
|
using Base::UnaryAssignment;
|
||||||
|
|
|
@ -94,12 +94,7 @@ class GTSAM_EXPORT TableFactor : public DiscreteFactor {
|
||||||
typedef std::shared_ptr<TableFactor> shared_ptr;
|
typedef std::shared_ptr<TableFactor> shared_ptr;
|
||||||
typedef Eigen::SparseVector<double>::InnerIterator SparseIt;
|
typedef Eigen::SparseVector<double>::InnerIterator SparseIt;
|
||||||
typedef std::vector<std::pair<DiscreteValues, double>> AssignValList;
|
typedef std::vector<std::pair<DiscreteValues, double>> AssignValList;
|
||||||
using Unary = std::function<double(const double&)>;
|
|
||||||
using UnaryAssignment =
|
|
||||||
std::function<double(const Assignment<Key>&, const double&)>;
|
|
||||||
using Binary = std::function<double(const double, const double)>;
|
|
||||||
|
|
||||||
public:
|
|
||||||
/// @name Standard Constructors
|
/// @name Standard Constructors
|
||||||
/// @{
|
/// @{
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue