diff --git a/gtsam/linear/tests/testGaussianBayesTreeUnordered.cpp b/gtsam/linear/tests/testGaussianBayesTreeUnordered.cpp index 5cbbd195c..dbd9a3641 100644 --- a/gtsam/linear/tests/testGaussianBayesTreeUnordered.cpp +++ b/gtsam/linear/tests/testGaussianBayesTreeUnordered.cpp @@ -57,7 +57,7 @@ namespace { GaussianBayesTreeClique::shared_ptr clique = boost::make_shared( boost::make_shared(conditional)); - clique->children = children; + clique->children.assign(children.begin(), children.end()); BOOST_FOREACH(const GaussianBayesTreeClique::shared_ptr& child, children) child->parent_ = clique; return clique; diff --git a/gtsam/symbolic/tests/testSymbolicBayesTree.cpp b/gtsam/symbolic/tests/testSymbolicBayesTree.cpp index 793d2d5dc..43598cb16 100644 --- a/gtsam/symbolic/tests/testSymbolicBayesTree.cpp +++ b/gtsam/symbolic/tests/testSymbolicBayesTree.cpp @@ -58,7 +58,7 @@ namespace { boost::make_shared( boost::make_shared( SymbolicConditional::FromKeys(keys, nrFrontals))); - clique->children = children; + clique->children.assign(children.begin(), children.end()); BOOST_FOREACH(const SymbolicBayesTreeClique::shared_ptr& child, children) child->parent_ = clique; return clique; diff --git a/gtsam/symbolic/tests/testSymbolicEliminationTree.cpp b/gtsam/symbolic/tests/testSymbolicEliminationTree.cpp index 095e84a18..c6d4c8937 100644 --- a/gtsam/symbolic/tests/testSymbolicEliminationTree.cpp +++ b/gtsam/symbolic/tests/testSymbolicEliminationTree.cpp @@ -19,9 +19,6 @@ #include #include -#include -#include -using namespace boost::assign; #include #include diff --git a/gtsam/symbolic/tests/testSymbolicFactorGraph.cpp b/gtsam/symbolic/tests/testSymbolicFactorGraph.cpp index 668d4e9d0..879ab6601 100644 --- a/gtsam/symbolic/tests/testSymbolicFactorGraph.cpp +++ b/gtsam/symbolic/tests/testSymbolicFactorGraph.cpp @@ -22,7 +22,6 @@ #include #include #include -#include using namespace std; using namespace gtsam; diff --git a/gtsam/symbolic/tests/testSymbolicJunctionTree.cpp b/gtsam/symbolic/tests/testSymbolicJunctionTree.cpp index e21ba7bcf..07c0c58e7 100644 --- a/gtsam/symbolic/tests/testSymbolicJunctionTree.cpp +++ b/gtsam/symbolic/tests/testSymbolicJunctionTree.cpp @@ -16,11 +16,6 @@ * @author Frank Dellaert */ -#include // for operator += -#include // for operator += -#include // for operator += -using namespace boost::assign; - #include #include @@ -28,6 +23,9 @@ using namespace boost::assign; #include #include +#include +using namespace boost::assign; + #include "symbolicExampleGraphs.h" using namespace gtsam; @@ -44,10 +42,10 @@ TEST( JunctionTree, constructor ) SymbolicJunctionTree actual(SymbolicEliminationTree(simpleChain, order)); - vector frontal1; frontal1 += 2, 3; - vector frontal2; frontal2 += 0, 1; - vector sep1; - vector sep2; sep2 += 2; + vector frontal1 = list_of(2)(3); + vector frontal2 = list_of(0)(1); + vector sep1; + vector sep2 = list_of(2); EXPECT(assert_equal(frontal1, actual.roots().front()->keys)); //EXPECT(assert_equal(sep1, actual.roots().front()->separator)); LONGS_EQUAL(1, (long)actual.roots().front()->factors.size());