From dd029f544f7c759cd1c4b3f9704bf31a8519e63e Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Tue, 13 Aug 2013 03:57:12 +0000 Subject: [PATCH] Fixed ambiguous GaussianConditional constructor --- gtsam/linear/GaussianConditional-inl.h | 9 --------- gtsam/linear/GaussianConditional.h | 9 --------- 2 files changed, 18 deletions(-) diff --git a/gtsam/linear/GaussianConditional-inl.h b/gtsam/linear/GaussianConditional-inl.h index 6fe7bd642..dd0307c48 100644 --- a/gtsam/linear/GaussianConditional-inl.h +++ b/gtsam/linear/GaussianConditional-inl.h @@ -24,15 +24,6 @@ namespace gtsam { - /* ************************************************************************* */ - template - GaussianConditional::GaussianConditional(Index key, const Vector& d, - const Matrix& R, const PARENTS& parents, const SharedDiagonal& sigmas, const typename PARENTS::value_type*) : - BaseFactor(boost::join( - ListOfOne(std::make_pair(key, R)), - parents), d, sigmas), - BaseConditional(1) {} - /* ************************************************************************* */ template GaussianConditional::GaussianConditional(const TERMS& terms, diff --git a/gtsam/linear/GaussianConditional.h b/gtsam/linear/GaussianConditional.h index a6532f291..5be687d7b 100644 --- a/gtsam/linear/GaussianConditional.h +++ b/gtsam/linear/GaussianConditional.h @@ -59,15 +59,6 @@ namespace gtsam { Key name1, const Matrix& S, Key name2, const Matrix& T, const SharedDiagonal& sigmas = SharedDiagonal()); - /** Constructor with number of arbitrary parents. \f$ |Rx+sum(Ai*xi)-d| \f$ - * @tparam PARENTS A container whose value type is std::pair, specifying the - * collection of parent keys and matrices. */ - template - GaussianConditional(Key key, const Vector& d, - const Matrix& R, const PARENTS& parents, - const SharedDiagonal& sigmas = SharedDiagonal(), - const typename PARENTS::value_type* = 0); - /** Constructor with arbitrary number of frontals and parents. * @tparam TERMS A container whose value type is std::pair, specifying the * collection of keys and matrices making up the conditional. */