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

Fix remaining FastVector errors for gcc + tbb + Ubuntu in tests

release/4.3a0
cbeall 2018-11-08 16:18:51 -08:00
parent 79fe89eaa9
commit 895da61f05
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/base/tests/testTreeTraversal.cpp
View File

@ -40,8 +40,8 @@ struct TestNode {
struct TestForest {
typedef TestNode Node;
typedef Node::shared_ptr sharedNode;
vector<sharedNode> roots_;
const vector<sharedNode>& roots() const { return roots_; }
FastVector<sharedNode> roots_;
const FastVector<sharedNode>& roots() const { return roots_; }
};
TestForest makeTestForest() {

11
gtsam_unstable/nonlinear/tests/testConcurrentIncrementalFilter.cpp
View File

@ -1110,12 +1110,13 @@ TEST( ConcurrentIncrementalFilter, CalculateMarginals_1 )
// Create the set of marginalizable variables
GaussianFactorGraph linearGraph = *factorGraph.linearize(newValues);
GaussianFactorGraph marginal = *linearGraph.eliminatePartialMultifrontal({1}, EliminateCholesky).second;
KeyVector linearIndices {1};
GaussianFactorGraph marginal = *linearGraph.eliminatePartialMultifrontal(linearIndices, EliminateCholesky).second;
NonlinearFactorGraph expectedMarginals;
for(const GaussianFactor::shared_ptr& factor: marginal) {
expectedMarginals.push_back(LinearContainerFactor(factor, newValues));
}
NonlinearFactorGraph expectedMarginals;
for(const GaussianFactor::shared_ptr& factor: marginal) {
expectedMarginals.push_back(LinearContainerFactor(factor, newValues));
}
FastList<Key> keysToMarginalize;
keysToMarginalize.push_back(1);