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

Fixes to make new merged library compile

release/4.3a0
Alex Cunningham 2010-10-08 22:21:48 +00:00
parent 1d52ff90a8
commit 76f400232f
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base/timing.h
View File

@ -6,6 +6,7 @@
*/ */
#pragma once #pragma once
#include <stdio.h>
#include <string> #include <string>
// simple class for accumulating execution timing information by name // simple class for accumulating execution timing information by name

2
inference/Factor.cpp
View File

@ -47,7 +47,7 @@ Conditional::shared_ptr Factor::eliminateFirst() {
boost::shared_ptr<BayesNet<Conditional> > Factor::eliminate(varid_t nFrontals) { boost::shared_ptr<BayesNet<Conditional> > Factor::eliminate(varid_t nFrontals) {
assert(keys_.size() >= nFrontals); assert(keys_.size() >= nFrontals);
checkSorted(); checkSorted();
typename BayesNet<Conditional>::shared_ptr fragment(new BayesNet<Conditional>()); BayesNet<Conditional>::shared_ptr fragment(new BayesNet<Conditional>());
const_iterator nextFrontal = this->begin(); const_iterator nextFrontal = this->begin();
for(varid_t n = 0; n < nFrontals; ++n, ++nextFrontal) for(varid_t n = 0; n < nFrontals; ++n, ++nextFrontal)
fragment->push_back(Conditional::shared_ptr(new Conditional(nextFrontal, const_iterator(this->end()), 1))); fragment->push_back(Conditional::shared_ptr(new Conditional(nextFrontal, const_iterator(this->end()), 1)));

4
inference/inference.cpp
View File

@ -18,8 +18,8 @@ Inference::EliminateOneSymbolic(FactorGraph<Factor>& factorGraph, VariableIndex<
tic("EliminateOne"); tic("EliminateOne");
// Get the factors involving the eliminated variable // Get the factors involving the eliminated variable
typename VariableIndex<>::mapped_type& varIndexEntry(variableIndex[var]); VariableIndex<>::mapped_type& varIndexEntry(variableIndex[var]);
typedef typename VariableIndex<>::mapped_factor_type mapped_factor_type; typedef VariableIndex<>::mapped_factor_type mapped_factor_type;
if(!varIndexEntry.empty()) { if(!varIndexEntry.empty()) {

4
linear/GaussianJunctionTree.cpp
View File

@ -1,4 +1,4 @@
/* /**
* GaussianJunctionTree.cpp * GaussianJunctionTree.cpp
* Created on: Jul 12, 2010 * Created on: Jul 12, 2010
* @author Kai Ni * @author Kai Ni
@ -34,7 +34,7 @@ namespace gtsam {
} }
// solve the bayes nets in the child nodes // solve the bayes nets in the child nodes
BOOST_FOREACH(const typename BayesTree::sharedClique& child, current->children()) { BOOST_FOREACH(const BayesTree::sharedClique& child, current->children()) {
btreeBackSubstitue(child, config); btreeBackSubstitue(child, config);
} }
} }