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

remove unecessary code

Browse Source
This commit is contained in:
Tiago Gomes 2012-05-28 19:47:20 +01:00
parent 62283f353c
commit 57e32267fe
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,7 +268,7 @@ BpSolver::calcFactorToVarMsg (SpLink* link)
for (size_t i = 0; i < links.size(); i++) {
msgSize *= links[i]->varNode()->range();
}
unsigned repetitions = 1;
unsigned reps = 1;
Params msgProduct (msgSize, LogAware::multIdenty());
if (Globals::logDomain) {
for (size_t i = links.size(); i-- > 0; ) {
@ -277,16 +277,12 @@ BpSolver::calcFactorToVarMsg (SpLink* link)
cout << " message from " << links[i]->varNode()->label();
cout << ": " ;
}
Util::add (msgProduct, getVarToFactorMsg (links[i]), repetitions);
repetitions *= links[i]->varNode()->range();
Util::add (msgProduct, getVarToFactorMsg (links[i]), reps);
if (Constants::SHOW_BP_CALCS) {
cout << endl;
}
} else {
unsigned range = links[i]->varNode()->range();
Util::add (msgProduct, Params (range, 0.0), repetitions);
repetitions *= range;
}
reps *= links[i]->varNode()->range();
}
} else {
for (size_t i = links.size(); i-- > 0; ) {
@ -295,16 +291,12 @@ BpSolver::calcFactorToVarMsg (SpLink* link)
cout << " message from " << links[i]->varNode()->label();
cout << ": " ;
}
Util::multiply (msgProduct, getVarToFactorMsg (links[i]), repetitions);
repetitions *= links[i]->varNode()->range();
Util::multiply (msgProduct, getVarToFactorMsg (links[i]), reps);
if (Constants::SHOW_BP_CALCS) {
cout << endl;
}
} else {
unsigned range = links[i]->varNode()->range();
Util::multiply (msgProduct, Params (range, 1.0), repetitions);
repetitions *= range;
}
reps *= links[i]->varNode()->range();
}
}
Factor result (src->factor().arguments(),

18
packages/CLPBN/horus/CbpSolver.cpp
View File

@ -211,7 +211,7 @@ CbpSolver::calcFactorToVarMsg (SpLink* _link)
for (size_t i = 0; i < links.size(); i++) {
msgSize *= links[i]->varNode()->range();
}
unsigned repetitions = 1;
unsigned reps = 1;
Params msgProduct (msgSize, LogAware::multIdenty());
if (Globals::logDomain) {
for (size_t i = links.size(); i-- > 0; ) {
@ -221,16 +221,12 @@ CbpSolver::calcFactorToVarMsg (SpLink* _link)
cout << " message from " << links[i]->varNode()->label();
cout << ": " ;
}
Util::add (msgProduct, getVarToFactorMsg (links[i]), repetitions);
repetitions *= links[i]->varNode()->range();
Util::add (msgProduct, getVarToFactorMsg (links[i]), reps);
if (Constants::SHOW_BP_CALCS) {
cout << endl;
}
} else {
unsigned range = links[i]->varNode()->range();
Util::add (msgProduct, Params (range, 0.0), repetitions);
repetitions *= range;
}
reps *= links[i]->varNode()->range();
}
} else {
for (size_t i = links.size(); i-- > 0; ) {
@ -240,16 +236,12 @@ CbpSolver::calcFactorToVarMsg (SpLink* _link)
cout << " message from " << links[i]->varNode()->label();
cout << ": " ;
}
Util::multiply (msgProduct, getVarToFactorMsg (links[i]), repetitions);
repetitions *= links[i]->varNode()->range();
Util::multiply (msgProduct, getVarToFactorMsg (links[i]), reps);
if (Constants::SHOW_BP_CALCS) {
cout << endl;
}
} else {
unsigned range = links[i]->varNode()->range();
Util::multiply (msgProduct, Params (range, 1.0), repetitions);
repetitions *= range;
}
reps *= links[i]->varNode()->range();
}
}
Factor result (src->factor().arguments(),