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

Some remaining std::vector stragglers

release/4.3a0
dellaert 2018-11-08 12:25:21 -05:00
parent 2aa43e11bd
commit d86782eebc
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/SolverComparer.cpp
View File

@ -429,7 +429,7 @@ void runIncremental()
// for (Key key12: boost::adaptors::reverse(values.keys())) {
// if(i != j) {
// gttic_(jointMarginalInformation);
// std::vector<Key> keys(2);
// KeyVector keys(2);
// keys[0] = key1;
// keys[1] = key2;
// JointMarginal info = marginals.jointMarginalInformation(keys);
@ -524,7 +524,7 @@ void runCompare()
// Check solution for equality
cout << "Comparing solutions..." << endl;
vector<Key> missingKeys;
KeyVector missingKeys;
br::set_symmetric_difference(soln1.keys(), soln2.keys(), std::back_inserter(missingKeys));
if(!missingKeys.empty()) {
cout << " Keys unique to one solution file: ";
@ -535,7 +535,7 @@ void runCompare()
}
cout << endl;
}
vector<Key> commonKeys;
KeyVector commonKeys;
br::set_intersection(soln1.keys(), soln2.keys(), std::back_inserter(commonKeys));
double maxDiff = 0.0;
for(Key j: commonKeys)

2
tests/testGaussianISAM2.cpp
View File

@ -648,7 +648,7 @@ TEST(ISAM2, slamlike_solution_partial_relinearization_check)
namespace {
bool checkMarginalizeLeaves(ISAM2& isam, const FastList<Key>& leafKeys) {
Matrix expectedAugmentedHessian, expected3AugmentedHessian;
vector<Key> toKeep;
KeyVector toKeep;
for(Key j: isam.getDelta() | br::map_keys)
if(find(leafKeys.begin(), leafKeys.end(), j) == leafKeys.end())
toKeep.push_back(j);

2
tests/testNonlinearFactor.cpp
View File

@ -401,7 +401,7 @@ TEST( NonlinearFactor, clone_rekey )
EXPECT(assert_equal(*init, *actClone));
// Re-key factor - clones with different keys
std::vector<Key> new_keys(4);
KeyVector new_keys(4);
new_keys[0] = X(5);
new_keys[1] = X(6);
new_keys[2] = X(7);

2
timing/timeIncremental.cpp
View File

@ -231,7 +231,7 @@ int main(int argc, char *argv[]) {
for (Key key2: boost::adaptors::reverse(values.keys())) {
if(i != j) {
gttic_(jointMarginalInformation);
std::vector<Key> keys(2);
KeyVector keys(2);
keys[0] = key1;
keys[1] = key2;
JointMarginal info = marginals.jointMarginalInformation(keys);