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

Revert "Improve namespace names"

Browse Source 
This reverts commit 973df43fe0.

On a second thought, namespaces are close to classes in the sense that both encapsulate data, so they should both use Pascal case notation.
This commit is contained in:
Tiago Gomes
2013-02-08 21:01:53 +00:00
parent 264ef7a067
commit 6a1a209ee3
33 changed files with 381 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/CLPBN/horus/VarElim.cpp
View File

@@ -13,7 +13,7 @@ namespace horus {
Params
VarElim::solveQuery (VarIds queryVids)
{
if (globals::verbosity > 1) {
if (Globals::verbosity > 1) {
std::cout << "Solving query on " ;
for (size_t i = 0; i < queryVids.size(); i++) {
if (i != 0) std::cout << ", " ;
@@ -28,8 +28,8 @@ VarElim::solveQuery (VarIds queryVids)
createFactorList();
absorveEvidence();
Params params = processFactorList (queryVids);
if (globals::logDomain) {
util::exp (params);
if (Globals::logDomain) {
Util::exp (params);
}
return params;
}
@@ -49,7 +49,7 @@ VarElim::printSolverFlags (void) const
case ElimHeuristic::MIN_FILL: ss << "min_fill"; break;
case ElimHeuristic::WEIGHTED_MIN_FILL: ss << "weighted_min_fill"; break;
}
ss << ",log_domain=" << util::toString (globals::logDomain);
ss << ",log_domain=" << Util::toString (Globals::logDomain);
ss << "]" ;
std::cout << ss.str() << std::endl;
}
@@ -81,15 +81,15 @@ VarElim::createFactorList (void)
void
VarElim::absorveEvidence (void)
{
if (globals::verbosity > 2) {
util::printDashedLine();
if (Globals::verbosity > 2) {
Util::printDashedLine();
std::cout << "(initial factor list)" << std::endl;
printActiveFactors();
}
const VarNodes& varNodes = fg.varNodes();
for (size_t i = 0; i < varNodes.size(); i++) {
if (varNodes[i]->hasEvidence()) {
if (globals::verbosity > 1) {
if (Globals::verbosity > 1) {
std::cout << "-> aborving evidence on ";
std::cout << varNodes[i]->label() << " = " ;
std::cout << varNodes[i]->getEvidence() << std::endl;
@@ -117,9 +117,9 @@ VarElim::processFactorList (const VarIds& queryVids)
VarIds elimOrder = ElimGraph::getEliminationOrder (
factorList_, queryVids);
for (size_t i = 0; i < elimOrder.size(); i++) {
if (globals::verbosity >= 2) {
if (globals::verbosity >= 3) {
util::printDashedLine();
if (Globals::verbosity >= 2) {
if (Globals::verbosity >= 3) {
Util::printDashedLine();
printActiveFactors();
}
std::cout << "-> summing out " ;
@@ -146,7 +146,7 @@ VarElim::processFactorList (const VarIds& queryVids)
result.reorderArguments (unobservedVids);
result.normalize();
if (globals::verbosity > 0) {
if (Globals::verbosity > 0) {
std::cout << "total factor size: " << totalFactorSize_ << std::endl;
std::cout << "largest factor size: " << largestFactorSize_ << std::endl;
std::cout << std::endl;