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

Fixed key sorting bug in symbolic elimination (still have work to do on key sorting)

release/4.3a0
Richard Roberts 2011-01-25 22:28:51 +00:00
parent 5c293ba2a7
commit 6a43f65ac6
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtsam/inference/IndexFactor.cpp
View File

@ -16,6 +16,7 @@
* @created Oct 17, 2010 * @created Oct 17, 2010
*/ */
#include <gtsam/base/FastSet.h>
#include <gtsam/inference/FactorBase-inl.h> #include <gtsam/inference/FactorBase-inl.h>
#include <gtsam/inference/IndexFactor.h> #include <gtsam/inference/IndexFactor.h>
#include <gtsam/inference/IndexConditional.h> #include <gtsam/inference/IndexConditional.h>
@ -31,9 +32,22 @@ IndexFactor::IndexFactor(const IndexConditional& c) : Base(static_cast<const Bas
pair<BayesNet<IndexConditional>::shared_ptr, IndexFactor::shared_ptr> IndexFactor::CombineAndEliminate( pair<BayesNet<IndexConditional>::shared_ptr, IndexFactor::shared_ptr> IndexFactor::CombineAndEliminate(
const FactorGraph<This>& factors, size_t nrFrontals) { const FactorGraph<This>& factors, size_t nrFrontals) {
FastSet<Index> variables;
BOOST_FOREACH(const shared_ptr& factor, factors) {
BOOST_FOREACH(Index var, *factor) {
variables.insert(var); } }
if(variables.size() < 1)
throw invalid_argument("IndexFactor::CombineAndEliminate called on factors with zero total variables.");
pair<BayesNet<Conditional>::shared_ptr, shared_ptr> result; pair<BayesNet<Conditional>::shared_ptr, shared_ptr> result;
result.second = Combine(factors, VariableSlots(factors)); result.first.reset(new BayesNet<IndexConditional>());
result.first = result.second->eliminate(nrFrontals); typename FastSet<Index>::const_iterator var;
for(var = variables.begin(); result.first->size() < nrFrontals; ++var)
result.first->push_back(IndexConditional::FromRange(var, variables.end(), 1));
result.second.reset(new IndexFactor(var, variables.end()));
return result; return result;
} }