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

Fixed gcc unit test compile errors

release/4.3a0
Richard Roberts 2013-08-08 16:30:14 +00:00
parent b572ad8131
commit 92459bc33b
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam/linear/tests/testGaussianBayesTreeUnordered.cpp
View File

@ -57,7 +57,7 @@ namespace {
GaussianBayesTreeClique::shared_ptr clique =
boost::make_shared<GaussianBayesTreeClique>(
boost::make_shared<GaussianConditional>(conditional));
clique->children = children;
clique->children.assign(children.begin(), children.end());
BOOST_FOREACH(const GaussianBayesTreeClique::shared_ptr& child, children)
child->parent_ = clique;
return clique;

2
gtsam/symbolic/tests/testSymbolicBayesTree.cpp
View File

@ -58,7 +58,7 @@ namespace {
boost::make_shared<SymbolicBayesTreeClique>(
boost::make_shared<SymbolicConditional>(
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;

3
gtsam/symbolic/tests/testSymbolicEliminationTree.cpp
View File

@ -19,9 +19,6 @@
#include <CppUnitLite/TestHarness.h>
#include <vector>
#include <boost/assign/std/vector.hpp>
#include <boost/assign/list_of.hpp>
using namespace boost::assign;
#include <boost/make_shared.hpp>
#include <gtsam/base/TestableAssertions.h>

1
gtsam/symbolic/tests/testSymbolicFactorGraph.cpp
View File

@ -22,7 +22,6 @@
#include <gtsam/symbolic/SymbolicBayesTree.h>
#include <gtsam/symbolic/SymbolicConditional.h>
#include <gtsam/symbolic/tests/symbolicExampleGraphs.h>
#include <boost/assign/std/vector.hpp>
using namespace std;
using namespace gtsam;

16
gtsam/symbolic/tests/testSymbolicJunctionTree.cpp
View File

@ -16,11 +16,6 @@
* @author Frank Dellaert
*/
#include <boost/assign/std/list.hpp> // for operator +=
#include <boost/assign/std/vector.hpp> // for operator +=
#include <boost/assign/std/set.hpp> // for operator +=
using namespace boost::assign;
#include <CppUnitLite/TestHarness.h>
#include <gtsam/base/TestableAssertions.h>
@ -28,6 +23,9 @@ using namespace boost::assign;
#include <gtsam/symbolic/SymbolicEliminationTree.h>
#include <gtsam/symbolic/SymbolicJunctionTree.h>
#include <boost/assign/list_of.hpp>
using namespace boost::assign;
#include "symbolicExampleGraphs.h"
using namespace gtsam;
@ -44,10 +42,10 @@ TEST( JunctionTree, constructor )
SymbolicJunctionTree actual(SymbolicEliminationTree(simpleChain, order));
vector<Index> frontal1; frontal1 += 2, 3;
vector<Index> frontal2; frontal2 += 0, 1;
vector<Index> sep1;
vector<Index> sep2; sep2 += 2;
vector<Key> frontal1 = list_of(2)(3);
vector<Key> frontal2 = list_of(0)(1);
vector<Key> sep1;
vector<Key> 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());