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

improvements on benchmarkings

Browse Source
This commit is contained in:
Tiago Gomes
2012-04-11 23:48:59 +01:00
parent 03013960d3
commit 564958ef8d
21 changed files with 241 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/CLPBN/clpbn/bp/CFactorGraph.cpp
View File

@@ -71,7 +71,13 @@ CFactorGraph::setInitialColors (void)
}
const FacNodes& facNodes = groundFg_->facNodes();
if (checkForIdenticalFactors) {
for (unsigned i = 0; i < facNodes.size(); i++) {
facNodes[i]->factor().setDistId (Util::maxUnsigned());
}
Util::printHeader ("Before check for identical factors");
groundFg_->print();
// FIXME FIXME FIXME : pfl should give correct dist ids.
if (checkForIdenticalFactors || false) {
unsigned groupCount = 1;
for (unsigned i = 0; i < facNodes.size(); i++) {
Factor& f1 = facNodes[i]->factor();
@@ -93,6 +99,8 @@ CFactorGraph::setInitialColors (void)
groupCount ++;
}
}
Util::printHeader ("After check for identical factors");
groundFg_->print();
// create the initial factor colors
DistColorMap distColors;
for (unsigned i = 0; i < facNodes.size(); i++) {
@@ -163,7 +171,7 @@ CFactorGraph::createGroups (void)
groupsHaveChanged = prevVarGroupsSize != varGroups.size()
|| prevFactorGroupsSize != facGroups.size();
}
//printGroups (varGroups, facGroups);
printGroups (varGroups, facGroups);
createClusters (varGroups, facGroups);
}
@@ -263,7 +271,6 @@ CFactorGraph::getGroundFactorGraph (void) const
fg->addEdge (static_cast<VarNode*> (myGroundVars[j]), fn);
}
}
fg->print();
return fg;
}