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

24
packages/CLPBN/horus/Factor.h
View File

@@ -34,7 +34,7 @@ class TFactor
void setDistId (unsigned id) { distId_ = id; }
void normalize (void) { log_aware::normalize (params_); }
void normalize (void) { LogAware::normalize (params_); }
void randomize (void);
@@ -91,7 +91,7 @@ template <typename T> inline void
TFactor<T>::setParams (const Params& newParams)
{
params_ = newParams;
assert (params_.size() == util::sizeExpected (ranges_));
assert (params_.size() == Util::sizeExpected (ranges_));
}
@@ -99,7 +99,7 @@ TFactor<T>::setParams (const Params& newParams)
template <typename T> inline size_t
TFactor<T>::indexOf (const T& t) const
{
return util::indexOf (args_, t);
return Util::indexOf (args_, t);
}
@@ -136,7 +136,7 @@ TFactor<T>::multiply (TFactor<T>& g)
{
if (args_ == g.arguments()) {
// optimization
globals::logDomain
Globals::logDomain
? params_ += g.params()
: params_ *= g.params();
return;
@@ -163,7 +163,7 @@ TFactor<T>::multiply (TFactor<T>& g)
extend (range_prod);
Params::iterator it = params_.begin();
MapIndexer indexer (args_, ranges_, g_args, g_ranges);
if (globals::logDomain) {
if (Globals::logDomain) {
for (; indexer.valid(); ++it, ++indexer) {
*it += g_params[indexer];
}
@@ -183,13 +183,13 @@ TFactor<T>::sumOutIndex (size_t idx)
assert (idx < args_.size());
assert (args_.size() > 1);
size_t new_size = params_.size() / ranges_[idx];
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 (ranges_, idx);
if (globals::logDomain) {
if (Globals::logDomain) {
for (; first != last; ++indexer) {
newps[indexer] = util::logSum (newps[indexer], *first++);
newps[indexer] = Util::logSum (newps[indexer], *first++);
}
} else {
for (; first != last; ++indexer) {
@@ -255,7 +255,7 @@ TFactor<T>::reorderArguments (const std::vector<T>& new_args)
template <typename T> inline bool
TFactor<T>::contains (const T& arg) const
{
return util::contains (args_, arg);
return Util::contains (args_, arg);
}
@@ -310,7 +310,7 @@ TFactor<T>::cartesianProduct (
Params::const_iterator first1 = backup.begin();
Params::const_iterator last1 = backup.end();
Params::const_iterator tmp;
if (globals::logDomain) {
if (Globals::logDomain) {
for (; first1 != last1; ++first1) {
for (tmp = first2; tmp != last2; ++tmp) {
params_.push_back ((*first1) + (*tmp));
@@ -335,10 +335,10 @@ class Factor : public TFactor<VarId>
Factor (const Factor&);
Factor (const VarIds&, const Ranges&, const Params&,
unsigned = util::maxUnsigned());
unsigned = Util::maxUnsigned());
Factor (const Vars&, const Params&,
unsigned = util::maxUnsigned());
unsigned = Util::maxUnsigned());
void sumOut (VarId);