diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

raising the paramaters to some power should happen after summing out, not before

Browse Source
This commit is contained in:
Tiago Gomes 2012-04-27 14:47:30 +01:00
parent 7599ccd5a1
commit 9e1a649262
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/CLPBN/clpbn/bp/Parfactor.cpp
View File

@ -138,14 +138,6 @@ Parfactor::sumOut (unsigned fIdx)
assert (fIdx < args_.size()); assert (fIdx < args_.size());
assert (args_[fIdx].contains (elimLogVars())); assert (args_[fIdx].contains (elimLogVars()));
LogVarSet excl = exclusiveLogVars (fIdx);
if (args_[fIdx].isCounting()) {
LogAware::pow (params_, constr_->getConditionalCount (
excl - args_[fIdx].countedLogVar()));
} else {
LogAware::pow (params_, constr_->getConditionalCount (excl));
}
if (args_[fIdx].isCounting()) { if (args_[fIdx].isCounting()) {
unsigned N = constr_->getConditionalCount ( unsigned N = constr_->getConditionalCount (
args_[fIdx].countedLogVar()); args_[fIdx].countedLogVar());
@ -179,9 +171,17 @@ Parfactor::sumOut (unsigned fIdx)
} }
} }
LogVarSet excl = exclusiveLogVars (fIdx);
if (args_[fIdx].isCounting()) {
LogAware::pow (params_, constr_->getConditionalCount (
excl - args_[fIdx].countedLogVar()));
} else {
LogAware::pow (params_, constr_->getConditionalCount (excl));
}
constr_->remove (excl);
args_.erase (args_.begin() + fIdx); args_.erase (args_.begin() + fIdx);
ranges_.erase (ranges_.begin() + fIdx); ranges_.erase (ranges_.begin() + fIdx);
constr_->remove (excl);
} }