Fixed ambiguous GaussianConditional constructor

release/4.3a0
Richard Roberts 2013-08-13 03:57:12 +00:00
parent dc062430d6
commit dd029f544f
2 changed files with 0 additions and 18 deletions

View File

@ -24,15 +24,6 @@
namespace gtsam { namespace gtsam {
/* ************************************************************************* */
template<class PARENTS>
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<typename PARENTS::value_type>(std::make_pair(key, R)),
parents), d, sigmas),
BaseConditional(1) {}
/* ************************************************************************* */ /* ************************************************************************* */
template<typename TERMS> template<typename TERMS>
GaussianConditional::GaussianConditional(const TERMS& terms, GaussianConditional::GaussianConditional(const TERMS& terms,

View File

@ -59,15 +59,6 @@ namespace gtsam {
Key name1, const Matrix& S, Key name2, const Matrix& T, Key name1, const Matrix& S, Key name2, const Matrix& T,
const SharedDiagonal& sigmas = SharedDiagonal()); 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<Key, Matrix>, specifying the
* collection of parent keys and matrices. */
template<class PARENTS>
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. /** Constructor with arbitrary number of frontals and parents.
* @tparam TERMS A container whose value type is std::pair<Key, Matrix>, specifying the * @tparam TERMS A container whose value type is std::pair<Key, Matrix>, specifying the
* collection of keys and matrices making up the conditional. */ * collection of keys and matrices making up the conditional. */