From fa4cf73e8e1617de0a0e6784efbe64b0d6537633 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Mon, 9 Aug 2010 03:48:33 +0000 Subject: [PATCH] Changed some int's to size_t's that I missed earlier --- linear/GaussianFactor.cpp | 2 +- linear/GaussianFactor.h | 2 +- linear/GaussianFactorGraph.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linear/GaussianFactor.cpp b/linear/GaussianFactor.cpp index 4d6657f63..9bbfb5b09 100644 --- a/linear/GaussianFactor.cpp +++ b/linear/GaussianFactor.cpp @@ -227,7 +227,7 @@ list GaussianFactor::keys() const { Dimensions GaussianFactor::dimensions() const { Dimensions result; BOOST_FOREACH(const NamedMatrix& jA, As_) - result.insert(std::pair(jA.first,jA.second.size2())); + result.insert(std::pair(jA.first,jA.second.size2())); return result; } diff --git a/linear/GaussianFactor.h b/linear/GaussianFactor.h index b242dd368..938fcd227 100644 --- a/linear/GaussianFactor.h +++ b/linear/GaussianFactor.h @@ -29,7 +29,7 @@ namespace gtsam { class Ordering; /** A map from key to dimension, useful in various contexts */ - typedef SymbolMap Dimensions; + typedef SymbolMap Dimensions; /** * Base Class for a linear factor. diff --git a/linear/GaussianFactorGraph.cpp b/linear/GaussianFactorGraph.cpp index 986851ff9..1cb0eb0bf 100644 --- a/linear/GaussianFactorGraph.cpp +++ b/linear/GaussianFactorGraph.cpp @@ -351,7 +351,7 @@ Dimensions GaussianFactorGraph::dimensions() const { Dimensions result; BOOST_FOREACH(const sharedFactor& factor,factors_) { Dimensions vs = factor->dimensions(); - Symbol key; int dim; + Symbol key; size_t dim; FOREACH_PAIR(key,dim,vs) result.insert(make_pair(key,dim)); } return result; @@ -367,7 +367,7 @@ GaussianFactorGraph GaussianFactorGraph::add_priors(double sigma) const { Dimensions vs = dimensions(); // for each of the variables, add a prior - Symbol key; int dim; + Symbol key; size_t dim; FOREACH_PAIR(key,dim,vs) { Matrix A = eye(dim); Vector b = zero(dim);