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

minor improvements

Browse Source
This commit is contained in:
Tiago Gomes 2012-05-28 19:10:29 +01:00
parent 004e6c0c5f
commit 64b53e8180
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/CLPBN/horus/BpSolver.cpp
View File

@ -333,7 +333,6 @@ Params
BpSolver::getVar2FactorMsg (const SpLink* link) const
{
const VarNode* src = link->getVariable();
const FacNode* dst = link->getFactor();
Params msg;
if (src->hasEvidence()) {
msg.resize (src->range(), LogAware::noEvidence());
@ -344,10 +343,10 @@ BpSolver::getVar2FactorMsg (const SpLink* link) const
if (Constants::SHOW_BP_CALCS) {
cout << msg;
}
SpLinkSet::const_iterator it;
const SpLinkSet& links = ninf (src)->getLinks();
if (Globals::logDomain) {
SpLinkSet::const_iterator it;
for (it = links.begin(); it != links.end(); ++ it) {
for (it = links.begin(); it != links.end(); ++it) {
msg += (*it)->getMessage();
if (Constants::SHOW_BP_CALCS) {
cout << " x " << (*it)->getMessage();
@ -355,14 +354,13 @@ BpSolver::getVar2FactorMsg (const SpLink* link) const
}
msg -= link->getMessage();
} else {
for (size_t i = 0; i < links.size(); i++) {
if (links[i]->getFactor() != dst) {
msg *= links[i]->getMessage();
if (Constants::SHOW_BP_CALCS) {
cout << " x " << links[i]->getMessage();
}
for (it = links.begin(); it != links.end(); ++it) {
msg *= (*it)->getMessage();
if (Constants::SHOW_BP_CALCS) {
cout << " x " << (*it)->getMessage();
}
}
msg /= link->getMessage();
}
if (Constants::SHOW_BP_CALCS) {
cout << " = " << msg;