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

Windows: Fix for discarding const qualifiers

release/4.3a0
cbeall3 2014-06-20 11:57:48 -04:00
parent 7c9328414c
commit de63d1981c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam/linear/GaussianFactorGraph.cpp
View File

@ -61,7 +61,7 @@ namespace gtsam {
for ( GaussianFactor::const_iterator it = gf->begin() ; it != gf->end() ; it++ ) { for ( GaussianFactor::const_iterator it = gf->begin() ; it != gf->end() ; it++ ) {
map<Key,size_t>::iterator it2 = spec.find(*it); map<Key,size_t>::iterator it2 = spec.find(*it);
if ( it2 == spec.end() ) { if ( it2 == spec.end() ) {
spec.insert(make_pair<Key,size_t>(*it, gf->getDim(it))); spec.insert(make_pair(*it, gf->getDim(it)));
} }
} }
} }

2
gtsam/linear/IterativeSolver.cpp
View File

@ -99,7 +99,7 @@ void KeyInfo::initialize(const GaussianFactorGraph &fg){
for ( size_t i = 0 ; i < n ; ++i ) { for ( size_t i = 0 ; i < n ; ++i ) {
const size_t key = ordering_[i]; const size_t key = ordering_[i];
const size_t dim = colspec.find(key)->second; const size_t dim = colspec.find(key)->second;
insert(make_pair<Key, KeyInfoEntry>(key, KeyInfoEntry(i, dim, start))); insert(make_pair(key, KeyInfoEntry(i, dim, start)));
start += dim ; start += dim ;
} }
numCols_ = start; numCols_ = start;

2
gtsam/linear/SubgraphPreconditioner.cpp
View File

@ -617,7 +617,7 @@ Vector getSubvector(const Vector &src, const KeyInfo &keyInfo, const FastVector<
size_t d = 0; size_t d = 0;
BOOST_FOREACH ( const Key &key, keys ) { BOOST_FOREACH ( const Key &key, keys ) {
const KeyInfoEntry &entry = keyInfo.find(key)->second; const KeyInfoEntry &entry = keyInfo.find(key)->second;
cache.push_back(make_pair<size_t,size_t>(entry.colstart(), entry.dim())); cache.push_back(make_pair(entry.colstart(), entry.dim()));
d += entry.dim(); d += entry.dim();
} }

2
gtsam/linear/SubgraphPreconditioner.h
View File

@ -302,7 +302,7 @@ namespace gtsam {
std::vector<std::pair<size_t,T> > tmp; std::vector<std::pair<size_t,T> > tmp;
tmp.reserve(n); tmp.reserve(n);
for ( size_t i = 0 ; i < n ; i++ ) for ( size_t i = 0 ; i < n ; i++ )
tmp.push_back(std::make_pair<size_t,T>(i, src[i])); tmp.push_back(std::make_pair(i, src[i]));
/* sort */ /* sort */
std::stable_sort(tmp.begin(), tmp.end()) ; std::stable_sort(tmp.begin(), tmp.end()) ;