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

Changed some int's to size_t's that I missed earlier

release/4.3a0
Richard Roberts 2010-08-09 03:48:33 +00:00
parent 6694b395c5
commit fa4cf73e8e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linear/GaussianFactor.cpp
View File

@ -227,7 +227,7 @@ list<Symbol> GaussianFactor::keys() const {
Dimensions GaussianFactor::dimensions() const { Dimensions GaussianFactor::dimensions() const {
Dimensions result; Dimensions result;
BOOST_FOREACH(const NamedMatrix& jA, As_) BOOST_FOREACH(const NamedMatrix& jA, As_)
result.insert(std::pair<Symbol,int>(jA.first,jA.second.size2())); result.insert(std::pair<Symbol,size_t>(jA.first,jA.second.size2()));
return result; return result;
} }

2
linear/GaussianFactor.h
View File

@ -29,7 +29,7 @@ namespace gtsam {
class Ordering; class Ordering;
/** A map from key to dimension, useful in various contexts */ /** A map from key to dimension, useful in various contexts */
typedef SymbolMap<int> Dimensions; typedef SymbolMap<size_t> Dimensions;
/** /**
* Base Class for a linear factor. * Base Class for a linear factor.

4
linear/GaussianFactorGraph.cpp
View File

@ -351,7 +351,7 @@ Dimensions GaussianFactorGraph::dimensions() const {
Dimensions result; Dimensions result;
BOOST_FOREACH(const sharedFactor& factor,factors_) { BOOST_FOREACH(const sharedFactor& factor,factors_) {
Dimensions vs = factor->dimensions(); Dimensions vs = factor->dimensions();
Symbol key; int dim; Symbol key; size_t dim;
FOREACH_PAIR(key,dim,vs) result.insert(make_pair(key,dim)); FOREACH_PAIR(key,dim,vs) result.insert(make_pair(key,dim));
} }
return result; return result;
@ -367,7 +367,7 @@ GaussianFactorGraph GaussianFactorGraph::add_priors(double sigma) const {
Dimensions vs = dimensions(); Dimensions vs = dimensions();
// for each of the variables, add a prior // for each of the variables, add a prior
Symbol key; int dim; Symbol key; size_t dim;
FOREACH_PAIR(key,dim,vs) { FOREACH_PAIR(key,dim,vs) {
Matrix A = eye(dim); Matrix A = eye(dim);
Vector b = zero(dim); Vector b = zero(dim);