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

minor improvements

Browse Source
This commit is contained in:
Tiago Gomes 2012-05-28 18:26:15 +01:00
parent 0cee50496e
commit 004e6c0c5f
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,11 +39,9 @@ Params
BpSolver::solveQuery (VarIds queryVids) BpSolver::solveQuery (VarIds queryVids)
{ {
assert (queryVids.empty() == false); assert (queryVids.empty() == false);
if (queryVids.size() == 1) { return queryVids.size() == 1
return getPosterioriOf (queryVids[0]); ? getPosterioriOf (queryVids[0])
} else { : getJointDistributionOf (queryVids);
return getJointDistributionOf (queryVids);
}
} }

2
packages/CLPBN/horus/HorusCli.cpp
View File

@ -178,7 +178,7 @@ runSolver (const FactorGraph& fg, const VarIds& queryIds)
solver->printSolverFlags(); solver->printSolverFlags();
cout << endl; cout << endl;
} }
if (queryIds.size() == 0) { if (queryIds.empty()) {
solver->printAllPosterioris(); solver->printAllPosterioris();
} else { } else {
solver->printAnswer (queryIds); solver->printAnswer (queryIds);

12
packages/CLPBN/horus/Solver.cpp
View File

@ -14,6 +14,7 @@ Solver::printAnswer (const VarIds& vids)
unobservedVids.push_back (vids[i]); unobservedVids.push_back (vids[i]);
} }
} }
if (unobservedVids.empty() == false) {
Params res = solveQuery (unobservedVids); Params res = solveQuery (unobservedVids);
vector<string> stateLines = Util::getStateLines (unobservedVars); vector<string> stateLines = Util::getStateLines (unobservedVars);
for (size_t i = 0; i < res.size(); i++) { for (size_t i = 0; i < res.size(); i++) {
@ -22,6 +23,7 @@ Solver::printAnswer (const VarIds& vids)
cout << endl; cout << endl;
} }
cout << endl; cout << endl;
}
} }
@ -29,14 +31,10 @@ Solver::printAnswer (const VarIds& vids)
void void
Solver::printAllPosterioris (void) Solver::printAllPosterioris (void)
{ {
VarIds vids; VarNodes vars = fg.varNodes();
const VarNodes& vars = fg.varNodes(); std::sort (vars.begin(), vars.end(), sortByVarId());
for (size_t i = 0; i < vars.size(); i++) { for (size_t i = 0; i < vars.size(); i++) {
vids.push_back (vars[i]->varId()); printAnswer ({vars[i]->varId()});
}
std::sort (vids.begin(), vids.end());
for (size_t i = 0; i < vids.size(); i++) {
printAnswer ({vids[i]});
} }
} }