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

don't raise counting log vars before multiplication

Browse Source
This commit is contained in:
Tiago Gomes 2012-04-28 01:10:04 +01:00
parent 1173b4c25b
commit d86e2c8386
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,6 +173,7 @@ Parfactor::sumOut (unsigned fIdx)
LogVarSet excl = exclusiveLogVars (fIdx); LogVarSet excl = exclusiveLogVars (fIdx);
if (args_[fIdx].isCounting()) { if (args_[fIdx].isCounting()) {
// counting log vars were already raised on counting conversion
LogAware::pow (params_, constr_->getConditionalCount ( LogAware::pow (params_, constr_->getConditionalCount (
excl - args_[fIdx].countedLogVar())); excl - args_[fIdx].countedLogVar()));
} else { } else {
@ -665,6 +666,9 @@ Parfactor::alignAndExponentiate (Parfactor* g1, Parfactor* g2)
} }
LogVarSet Y_1 = g1->logVarSet() - LogVarSet (X_1); LogVarSet Y_1 = g1->logVarSet() - LogVarSet (X_1);
LogVarSet Y_2 = g2->logVarSet() - LogVarSet (X_2); LogVarSet Y_2 = g2->logVarSet() - LogVarSet (X_2);
// counting log vars were already raised on counting conversion
Y_1 -= g1->countedLogVars();
Y_2 -= g2->countedLogVars();
assert (g1->constr()->isCountNormalized (Y_1)); assert (g1->constr()->isCountNormalized (Y_1));
assert (g2->constr()->isCountNormalized (Y_2)); assert (g2->constr()->isCountNormalized (Y_2));
unsigned condCount1 = g1->constr()->getConditionalCount (Y_1); unsigned condCount1 = g1->constr()->getConditionalCount (Y_1);