diff --git a/gtsam/hybrid/hybrid.i b/gtsam/hybrid/hybrid.i index 686ce60ac..dcf0fce04 100644 --- a/gtsam/hybrid/hybrid.i +++ b/gtsam/hybrid/hybrid.i @@ -77,7 +77,8 @@ class HybridGaussianFactor : gtsam::HybridFactor { HybridGaussianFactor( const gtsam::KeyVector& continuousKeys, const gtsam::DiscreteKeys& discreteKeys, - const std::vector& factorsList); + const std::vector>& + factorsList); void print(string s = "HybridGaussianFactor\n", const gtsam::KeyFormatter& keyFormatter = @@ -242,14 +243,14 @@ class HybridNonlinearFactorGraph { class HybridNonlinearFactor : gtsam::HybridFactor { HybridNonlinearFactor( const gtsam::KeyVector& keys, const gtsam::DiscreteKeys& discreteKeys, - const gtsam::DecisionTree& factors, + const gtsam::DecisionTree< + gtsam::Key, std::pair>& factors, bool normalized = false); - template - HybridNonlinearFactor(const gtsam::KeyVector& keys, - const gtsam::DiscreteKeys& discreteKeys, - const std::vector& factors, - bool normalized = false); + HybridNonlinearFactor( + const gtsam::KeyVector& keys, const gtsam::DiscreteKeys& discreteKeys, + const std::vector>& factors, + bool normalized = false); double error(const gtsam::Values& continuousValues, const gtsam::DiscreteValues& discreteValues) const;