12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed ambiguous GC constructor

release/4.3a0
Richard Roberts 2013-07-16 20:22:06 +00:00
parent b24af8554b
commit 7ad8c15028
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/linear/GaussianConditionalUnordered-inl.h
View File

@ -25,9 +25,9 @@
namespace gtsam { namespace gtsam {
/* ************************************************************************* */ /* ************************************************************************* */
template<typename PARENTS> template<class PARENTS>
GaussianConditionalUnordered::GaussianConditionalUnordered(Index key, const Vector& d, GaussianConditionalUnordered::GaussianConditionalUnordered(Index key, const Vector& d,
const Matrix& R, const PARENTS& parents, const SharedDiagonal& sigmas) : const Matrix& R, const PARENTS& parents, const SharedDiagonal& sigmas, const typename PARENTS::value_type*) :
BaseFactor(boost::join(boost::assign::cref_list_of<1,typename PARENTS::value_type>(std::make_pair(key, R)), parents), d, sigmas), BaseFactor(boost::join(boost::assign::cref_list_of<1,typename PARENTS::value_type>(std::make_pair(key, R)), parents), d, sigmas),
BaseConditional(1) {} BaseConditional(1) {}

5
gtsam/linear/GaussianConditionalUnordered.h
View File

@ -62,10 +62,11 @@ namespace gtsam {
/** Constructor with number of arbitrary parents. \f$ |Rx+sum(Ai*xi)-d| \f$ /** 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 * @tparam PARENTS A container whose value type is std::pair<Key, Matrix>, specifying the
* collection of parent keys and matrices. */ * collection of parent keys and matrices. */
template<typename PARENTS> template<class PARENTS>
GaussianConditionalUnordered(Key key, const Vector& d, GaussianConditionalUnordered(Key key, const Vector& d,
const Matrix& R, const PARENTS& parents, const Matrix& R, const PARENTS& parents,
const SharedDiagonal& sigmas = SharedDiagonal()); 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