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

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

@@ -80,7 +80,7 @@ HistogramSet::getHistograms (unsigned N, unsigned R)
unsigned
HistogramSet::nrHistograms (unsigned N, unsigned R)
{
return util::nrCombinations (N + R - 1, R - 1);
return Util::nrCombinations (N + R - 1, R - 1);
}
@@ -102,17 +102,17 @@ std::vector<double>
HistogramSet::getNumAssigns (unsigned N, unsigned R)
{
HistogramSet hs (N, R);
double N_fac = util::logFactorial (N);
double N_fac = Util::logFactorial (N);
unsigned H = hs.nrHistograms();
std::vector<double> numAssigns;
numAssigns.reserve (H);
for (unsigned h = 0; h < H; h++) {
double prod = 0.0;
for (unsigned r = 0; r < R; r++) {
prod += util::logFactorial (hs[r]);
prod += Util::logFactorial (hs[r]);
}
double res = N_fac - prod;
numAssigns.push_back (globals::logDomain ? res : std::exp (res));
numAssigns.push_back (Globals::logDomain ? res : std::exp (res));
hs.nextHistogram();
}
return numAssigns;