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

20
packages/CLPBN/horus/Factor.cpp
View File

@@ -27,7 +27,7 @@ Factor::Factor (
ranges_ = ranges;
params_ = params;
distId_ = distId;
assert (params_.size() == util::sizeExpected (ranges_));
assert (params_.size() == Util::sizeExpected (ranges_));
}
@@ -43,7 +43,7 @@ Factor::Factor (
}
params_ = params;
distId_ = distId;
assert (params_.size() == util::sizeExpected (ranges_));
assert (params_.size() == Util::sizeExpected (ranges_));
}
@@ -131,7 +131,7 @@ Factor::print (void) const
for (size_t i = 0; i < args_.size(); i++) {
vars.push_back (new Var (args_[i], ranges_[i]));
}
std::vector<std::string> jointStrings = util::getStateLines (vars);
std::vector<std::string> jointStrings = Util::getStateLines (vars);
for (size_t i = 0; i < params_.size(); i++) {
// cout << "[" << distId_ << "] " ;
std::cout << "f(" << jointStrings[i] << ")" ;
@@ -149,11 +149,11 @@ void
Factor::sumOutFirstVariable (void)
{
size_t sep = params_.size() / 2;
if (globals::logDomain) {
if (Globals::logDomain) {
std::transform (
params_.begin(), params_.begin() + sep,
params_.begin() + sep, params_.begin(),
util::logSum);
Util::logSum);
} else {
std::transform (
@@ -174,10 +174,10 @@ Factor::sumOutLastVariable (void)
Params::iterator first1 = params_.begin();
Params::iterator first2 = params_.begin();
Params::iterator last = params_.end();
if (globals::logDomain) {
if (Globals::logDomain) {
while (first2 != last) {
// the arguments can be swaped, but that is ok
*first1++ = util::logSum (*first2++, *first2++);
*first1++ = Util::logSum (*first2++, *first2++);
}
} else {
while (first2 != last) {
@@ -206,13 +206,13 @@ Factor::sumOutArgs (const std::vector<bool>& mask)
ranges_.push_back (ranges_[i]);
}
}
Params newps (new_size, log_aware::addIdenty());
Params newps (new_size, LogAware::addIdenty());
Params::const_iterator first = params_.begin();
Params::const_iterator last = params_.end();
MapIndexer indexer (oldRanges, mask);
if (globals::logDomain) {
if (Globals::logDomain) {
while (first != last) {
newps[indexer] = util::logSum (newps[indexer], *first++);
newps[indexer] = Util::logSum (newps[indexer], *first++);
++ indexer;
}
} else {