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

34
packages/CLPBN/horus/HorusYap.cpp
View File

@@ -48,8 +48,8 @@ createLiftedNetwork (void)
}
// LiftedUtils::printSymbolDictionary();
if (globals::verbosity > 2) {
util::printHeader ("INITIAL PARFACTORS");
if (Globals::verbosity > 2) {
Util::printHeader ("INITIAL PARFACTORS");
for (size_t i = 0; i < parfactors.size(); i++) {
parfactors[i]->print();
std::cout << std::endl;
@@ -58,8 +58,8 @@ createLiftedNetwork (void)
ParfactorList* pfList = new ParfactorList (parfactors);
if (globals::verbosity > 2) {
util::printHeader ("SHATTERED PARFACTORS");
if (Globals::verbosity > 2) {
Util::printHeader ("SHATTERED PARFACTORS");
pfList->print();
}
@@ -120,7 +120,7 @@ createGroundNetwork (void)
if (FactorGraph::printFactorGraph()) {
fg->print();
}
if (globals::verbosity > 0) {
if (Globals::verbosity > 0) {
std::cout << "factor graph contains " ;
std::cout << fg->nrVarNodes() << " variables and " ;
std::cout << fg->nrFacNodes() << " factors " << std::endl;
@@ -139,13 +139,13 @@ runLiftedSolver (void)
LiftedOperations::absorveEvidence (pfListCopy, *network->second);
LiftedSolver* solver = 0;
switch (globals::liftedSolver) {
switch (Globals::liftedSolver) {
case LiftedSolverType::LVE: solver = new LiftedVe (pfListCopy); break;
case LiftedSolverType::LBP: solver = new LiftedBp (pfListCopy); break;
case LiftedSolverType::LKC: solver = new LiftedKc (pfListCopy); break;
}
if (globals::verbosity > 0) {
if (Globals::verbosity > 0) {
solver->printSolverFlags();
std::cout << std::endl;
}
@@ -205,7 +205,7 @@ runGroundSolver (void)
if (fg->bayesianFactors()) {
std::set<VarId> vids;
for (size_t i = 0; i < tasks.size(); i++) {
util::addToSet (vids, tasks[i]);
Util::addToSet (vids, tasks[i]);
}
mfg = BayesBall::getMinimalFactorGraph (
*fg, VarIds (vids.begin(), vids.end()));
@@ -213,13 +213,13 @@ runGroundSolver (void)
GroundSolver* solver = 0;
CountingBp::setFindIdenticalFactorsFlag (false);
switch (globals::groundSolver) {
switch (Globals::groundSolver) {
case GroundSolverType::VE: solver = new VarElim (*mfg); break;
case GroundSolverType::BP: solver = new BeliefProp (*mfg); break;
case GroundSolverType::CBP: solver = new CountingBp (*mfg); break;
}
if (globals::verbosity > 0) {
if (Globals::verbosity > 0) {
solver->printSolverFlags();
std::cout << std::endl;
}
@@ -251,14 +251,14 @@ setParfactorsParams (void)
while (distIdsList != YAP_TermNil()) {
unsigned distId = (unsigned) YAP_IntOfTerm (
YAP_HeadOfTerm (distIdsList));
assert (util::contains (paramsMap, distId) == false);
assert (Util::contains (paramsMap, distId) == false);
paramsMap[distId] = readParameters (YAP_HeadOfTerm (paramsList));
distIdsList = YAP_TailOfTerm (distIdsList);
paramsList = YAP_TailOfTerm (paramsList);
}
ParfactorList::iterator it = pfList->begin();
while (it != pfList->end()) {
assert (util::contains (paramsMap, (*it)->distId()));
assert (Util::contains (paramsMap, (*it)->distId()));
(*it)->setParams (paramsMap[(*it)->distId()]);
++ it;
}
@@ -277,7 +277,7 @@ setFactorsParams (void)
while (distIdsList != YAP_TermNil()) {
unsigned distId = (unsigned) YAP_IntOfTerm (
YAP_HeadOfTerm (distIdsList));
assert (util::contains (paramsMap, distId) == false);
assert (Util::contains (paramsMap, distId) == false);
paramsMap[distId] = readParameters (YAP_HeadOfTerm (paramsList));
distIdsList = YAP_TailOfTerm (distIdsList);
paramsList = YAP_TailOfTerm (paramsList);
@@ -285,7 +285,7 @@ setFactorsParams (void)
const FacNodes& facNodes = fg->facNodes();
for (size_t i = 0; i < facNodes.size(); i++) {
unsigned distId = facNodes[i]->factor().distId();
assert (util::contains (paramsMap, distId));
assert (Util::contains (paramsMap, distId));
facNodes[i]->factor().setParams (paramsMap[distId]);
}
return TRUE;
@@ -343,7 +343,7 @@ setHorusFlag (void)
} else {
value = ((char*) YAP_AtomName (YAP_AtomOfTerm (YAP_ARG2)));
}
return util::setHorusFlag (option, value);
return Util::setHorusFlag (option, value);
}
@@ -519,8 +519,8 @@ readParameters (YAP_Term paramL)
params.push_back ((double) YAP_FloatOfTerm (YAP_HeadOfTerm (paramL)));
paramL = YAP_TailOfTerm (paramL);
}
if (globals::logDomain) {
util::log (params);
if (Globals::logDomain) {
Util::log (params);
}
return params;
}