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

Improve solver flags

Browse Source
This commit is contained in:
Tiago Gomes
2012-12-27 23:21:32 +00:00
parent d36b63ece3
commit 7d9af75c35
7 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/CLPBN/horus/CountingBp.cpp
View File

@@ -2,7 +2,7 @@
#include "WeightedBp.h"
bool CountingBp::checkForIdenticalFactors = true;
bool CountingBp::fif_ = true;
CountingBp::CountingBp (const FactorGraph& fg)
@@ -36,7 +36,7 @@ CountingBp::printSolverFlags (void) const
{
stringstream ss;
ss << "counting bp [" ;
ss << "schedule=" ;
ss << "msg_schedule=" ;
switch (WeightedBp::msgSchedule()) {
case MsgSchedule::SEQ_FIXED: ss << "seq_fixed"; break;
case MsgSchedule::SEQ_RANDOM: ss << "seq_random"; break;
@@ -46,7 +46,7 @@ CountingBp::printSolverFlags (void) const
ss << ",max_iter=" << WeightedBp::maxIterations();
ss << ",accuracy=" << WeightedBp::accuracy();
ss << ",log_domain=" << Util::toString (Globals::logDomain);
ss << ",chkif=" << Util::toString (CountingBp::checkForIdenticalFactors);
ss << ",fif=" << Util::toString (CountingBp::fif_);
ss << "]" ;
cout << ss.str() << endl;
}
@@ -93,8 +93,7 @@ void
CountingBp::findIdenticalFactors()
{
const FacNodes& facNodes = fg.facNodes();
if (checkForIdenticalFactors == false ||
facNodes.size() == 1) {
if (fif_ == false || facNodes.size() == 1) {
return;
}
for (size_t i = 0; i < facNodes.size(); i++) {