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

Fix discrete module

release/4.3a0
Varun Agrawal 2022-02-17 11:15:02 -05:00
parent fcd418a673
commit 566c7b9cb8
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/discrete/AlgebraicDecisionTree.h
View File

@ -33,7 +33,7 @@ namespace gtsam {
* TODO: consider eliminating this class altogether? * TODO: consider eliminating this class altogether?
*/ */
template <typename L> template <typename L>
class GTSAM_EXPORT AlgebraicDecisionTree : public DecisionTree<L, double> { class AlgebraicDecisionTree : public DecisionTree<L, double> {
/** /**
* @brief Default method used by `labelFormatter` or `valueFormatter` when * @brief Default method used by `labelFormatter` or `valueFormatter` when
* printing. * printing.
@ -127,7 +127,7 @@ namespace gtsam {
return map.at(label); return map.at(label);
}; };
std::function<double(const double&)> op = Ring::id; std::function<double(const double&)> op = Ring::id;
this->root_ = this->template convertFrom(other.root_, L_of_M, op); this->root_ = DecisionTree<L, double>::convertFrom(other.root_, L_of_M, op);
} }
/** sum */ /** sum */

2
gtsam/discrete/DiscreteLookupDAG.h
View File

@ -36,7 +36,7 @@ class DiscreteBayesNet;
* Inherits from discrete conditional for convenience, but is not normalized. * Inherits from discrete conditional for convenience, but is not normalized.
* Is used in the max-product algorithm. * Is used in the max-product algorithm.
*/ */
class DiscreteLookupTable : public DiscreteConditional { class GTSAM_EXPORT DiscreteLookupTable : public DiscreteConditional {
public: public:
using This = DiscreteLookupTable; using This = DiscreteLookupTable;
using shared_ptr = boost::shared_ptr<This>; using shared_ptr = boost::shared_ptr<This>;

2
gtsam/discrete/DiscreteMarginals.h
View File

@ -29,7 +29,7 @@ namespace gtsam {
/** /**
* A class for computing marginals of variables in a DiscreteFactorGraph * A class for computing marginals of variables in a DiscreteFactorGraph
*/ */
class GTSAM_EXPORT DiscreteMarginals { class DiscreteMarginals {
protected: protected:

2
gtsam/discrete/DiscreteValues.h
View File

@ -37,7 +37,7 @@ namespace gtsam {
* stores cardinality of a Discrete variable. It should be handled naturally in * stores cardinality of a Discrete variable. It should be handled naturally in
* the new class DiscreteValue, as the variable's type (domain) * the new class DiscreteValue, as the variable's type (domain)
*/ */
class DiscreteValues : public Assignment<Key> { class GTSAM_EXPORT DiscreteValues : public Assignment<Key> {
public: public:
using Base = Assignment<Key>; // base class using Base = Assignment<Key>; // base class