Fix discrete module
							parent
							
								
									fcd418a673
								
							
						
					
					
						commit
						566c7b9cb8
					
				|  | @ -33,7 +33,7 @@ namespace gtsam { | |||
|    * TODO: consider eliminating this class altogether? | ||||
|    */ | ||||
|   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 | ||||
|      * printing. | ||||
|  | @ -127,7 +127,7 @@ namespace gtsam { | |||
|         return map.at(label); | ||||
|       }; | ||||
|       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 */ | ||||
|  |  | |||
|  | @ -36,7 +36,7 @@ class DiscreteBayesNet; | |||
|  * Inherits from discrete conditional for convenience, but is not normalized. | ||||
|  * Is used in the max-product algorithm. | ||||
|  */ | ||||
| class DiscreteLookupTable : public DiscreteConditional { | ||||
| class GTSAM_EXPORT DiscreteLookupTable : public DiscreteConditional { | ||||
|  public: | ||||
|   using This = DiscreteLookupTable; | ||||
|   using shared_ptr = boost::shared_ptr<This>; | ||||
|  |  | |||
|  | @ -29,7 +29,7 @@ namespace gtsam { | |||
|   /**
 | ||||
|    * A class for computing marginals of variables in a DiscreteFactorGraph | ||||
|    */ | ||||
| class GTSAM_EXPORT DiscreteMarginals { | ||||
| class DiscreteMarginals { | ||||
| 
 | ||||
|   protected: | ||||
| 
 | ||||
|  |  | |||
|  | @ -37,7 +37,7 @@ namespace gtsam { | |||
|  * stores cardinality of a Discrete variable. It should be handled naturally in | ||||
|  * the new class DiscreteValue, as the variable's type (domain) | ||||
|  */ | ||||
| class DiscreteValues : public Assignment<Key> { | ||||
| class GTSAM_EXPORT DiscreteValues : public Assignment<Key> { | ||||
|  public: | ||||
|   using Base = Assignment<Key>;  // base class
 | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue