Fixed some warnings

release/4.3a0
Alex Cunningham 2014-01-04 20:35:19 -05:00
parent e05a2adca8
commit 96a4d80da4
4 changed files with 2 additions and 7 deletions

View File

@ -760,7 +760,7 @@ Matrix expm(const Matrix& A, size_t K) {
/* ************************************************************************* */ /* ************************************************************************* */
Matrix Cayley(const Matrix& A) { Matrix Cayley(const Matrix& A) {
size_t n = A.cols(); int n = A.cols();
assert(A.rows() == n); assert(A.rows() == n);
// original // original

View File

@ -216,7 +216,6 @@ namespace gtsam {
* To print each node, this function calls the \c print function of the tree nodes. */ * To print each node, this function calls the \c print function of the tree nodes. */
template<class FOREST> template<class FOREST>
void PrintForest(const FOREST& forest, std::string str, const KeyFormatter& keyFormatter) { void PrintForest(const FOREST& forest, std::string str, const KeyFormatter& keyFormatter) {
typedef typename FOREST::Node Node;
PrintForestVisitorPre visitor(keyFormatter); PrintForestVisitorPre visitor(keyFormatter);
DepthFirstForest(forest, str, visitor); DepthFirstForest(forest, str, visitor);
} }

View File

@ -75,10 +75,6 @@ namespace gtsam {
FastVector<typename TREE::sharedFactor> FastVector<typename TREE::sharedFactor>
EliminateTree(RESULT& result, const TREE& tree, const typename TREE::Eliminate& function) EliminateTree(RESULT& result, const TREE& tree, const typename TREE::Eliminate& function)
{ {
// Typedefs
typedef typename TREE::sharedNode sharedNode;
typedef typename TREE::sharedFactor sharedFactor;
// Do elimination using a depth-first traversal. During the pre-order visit (see // Do elimination using a depth-first traversal. During the pre-order visit (see
// eliminationPreOrderVisitor), we store a pointer to the parent data (where we'll put the // eliminationPreOrderVisitor), we store a pointer to the parent data (where we'll put the
// remaining factor) and reserve a vector of factors to store the children elimination // remaining factor) and reserve a vector of factors to store the children elimination

View File

@ -620,7 +620,7 @@ namespace gtsam {
model_ = noiseModel::Constrained::MixedSigmas(model_->sigmas().tail(remainingRows)); model_ = noiseModel::Constrained::MixedSigmas(model_->sigmas().tail(remainingRows));
else else
model_ = noiseModel::Diagonal::Sigmas(model_->sigmas().tail(remainingRows)); model_ = noiseModel::Diagonal::Sigmas(model_->sigmas().tail(remainingRows));
assert(model_->dim() == Ab_.rows()); assert(model_->dim() == (size_t)Ab_.rows());
} }
gttoc(remaining_factor); gttoc(remaining_factor);