revert previous commit
							parent
							
								
									a7fc6e3763
								
							
						
					
					
						commit
						8390ffa2cb
					
				|  | @ -56,8 +56,8 @@ class GTSAM_UNSTABLE_EXPORT AllDiff : public Constraint { | |||
|   /// Multiply factors, DiscreteFactor::shared_ptr edition
 | ||||
|   DiscreteFactor::shared_ptr multiply( | ||||
|       const DiscreteFactor::shared_ptr& df) const override { | ||||
|     return std::make_shared<DecisionTreeFactor>(this->toDecisionTreeFactor() * | ||||
|                                                 df->toDecisionTreeFactor()); | ||||
|     return std::make_shared<DecisionTreeFactor>( | ||||
|         this->operator*(df->toDecisionTreeFactor())); | ||||
|   } | ||||
| 
 | ||||
|   /// Compute error for each assignment and return as a tree
 | ||||
|  |  | |||
|  | @ -72,8 +72,8 @@ class BinaryAllDiff : public Constraint { | |||
|   /// Multiply factors, DiscreteFactor::shared_ptr edition
 | ||||
|   DiscreteFactor::shared_ptr multiply( | ||||
|       const DiscreteFactor::shared_ptr& df) const override { | ||||
|     return std::make_shared<DecisionTreeFactor>(this->toDecisionTreeFactor() * | ||||
|                                                 df->toDecisionTreeFactor()); | ||||
|     return std::make_shared<DecisionTreeFactor>( | ||||
|         this->operator*(df->toDecisionTreeFactor())); | ||||
|   } | ||||
| 
 | ||||
|   /*
 | ||||
|  |  | |||
|  | @ -93,8 +93,8 @@ class GTSAM_UNSTABLE_EXPORT Domain : public Constraint { | |||
|   /// Multiply factors, DiscreteFactor::shared_ptr edition
 | ||||
|   DiscreteFactor::shared_ptr multiply( | ||||
|       const DiscreteFactor::shared_ptr& df) const override { | ||||
|     return std::make_shared<DecisionTreeFactor>(this->toDecisionTreeFactor() * | ||||
|                                                 df->toDecisionTreeFactor()); | ||||
|     return std::make_shared<DecisionTreeFactor>( | ||||
|         this->operator*(df->toDecisionTreeFactor())); | ||||
|   } | ||||
| 
 | ||||
|   /*
 | ||||
|  |  | |||
|  | @ -66,8 +66,8 @@ class GTSAM_UNSTABLE_EXPORT SingleValue : public Constraint { | |||
|   /// Multiply factors, DiscreteFactor::shared_ptr edition
 | ||||
|   DiscreteFactor::shared_ptr multiply( | ||||
|       const DiscreteFactor::shared_ptr& df) const override { | ||||
|     return std::make_shared<DecisionTreeFactor>(this->toDecisionTreeFactor() * | ||||
|                                                 df->toDecisionTreeFactor()); | ||||
|     return std::make_shared<DecisionTreeFactor>( | ||||
|         this->operator*(df->toDecisionTreeFactor())); | ||||
|   } | ||||
| 
 | ||||
|   /*
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue