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

rename CutIndexer to MapIndexer

Browse Source
This commit is contained in:
Tiago Gomes 2012-05-28 12:32:15 +01:00
parent 3290834dfe
commit 3986012e56
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,7 +209,7 @@ Factor::sumOutArgs (const vector<bool>& mask)
Params newps (new_size, LogAware::addIdenty()); Params newps (new_size, LogAware::addIdenty());
Params::const_iterator first = params_.begin(); Params::const_iterator first = params_.begin();
Params::const_iterator last = params_.end(); Params::const_iterator last = params_.end();
CutIndexer indexer (oldRanges, mask); MapIndexer indexer (oldRanges, mask);
if (Globals::logDomain) { if (Globals::logDomain) {
while (first != last) { while (first != last) {
newps[indexer] = Util::logSum (newps[indexer], *first++); newps[indexer] = Util::logSum (newps[indexer], *first++);

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

@ -101,7 +101,7 @@ class TFactor
} else { } else {
extend (range_prod); extend (range_prod);
Params::iterator it = params_.begin(); Params::iterator it = params_.begin();
CutIndexer indexer (args_, ranges_, g_args, g_ranges); MapIndexer indexer (args_, ranges_, g_args, g_ranges);
if (Globals::logDomain) { if (Globals::logDomain) {
for (; indexer.valid(); ++indexer) { for (; indexer.valid(); ++indexer) {
*it++ += g_params[indexer]; *it++ += g_params[indexer];
@ -122,7 +122,7 @@ class TFactor
Params newps (new_size, LogAware::addIdenty()); Params newps (new_size, LogAware::addIdenty());
Params::const_iterator first = params_.begin(); Params::const_iterator first = params_.begin();
Params::const_iterator last = params_.end(); Params::const_iterator last = params_.end();
CutIndexer indexer (ranges_, idx); MapIndexer indexer (ranges_, idx);
if (Globals::logDomain) { if (Globals::logDomain) {
for (; first != last; ++indexer) { for (; first != last; ++indexer) {
newps[indexer] = Util::logSum (newps[indexer], *first++); newps[indexer] = Util::logSum (newps[indexer], *first++);
@ -171,7 +171,7 @@ class TFactor
} }
Params newps; Params newps;
newps.reserve (params_.size()); newps.reserve (params_.size());
CutIndexer indexer (new_args, new_ranges, args_, ranges_); MapIndexer indexer (new_args, new_ranges, args_, ranges_);
for (; indexer.valid(); ++indexer) { for (; indexer.valid(); ++indexer) {
newps.push_back (params_[indexer]); newps.push_back (params_[indexer]);
} }

14
packages/CLPBN/horus/Indexer.h
View File

@ -137,10 +137,10 @@ operator<< (std::ostream& os, const Indexer& indexer)
class CutIndexer class MapIndexer
{ {
public: public:
CutIndexer (const Ranges& ranges, const vector<bool>& mask) MapIndexer (const Ranges& ranges, const vector<bool>& mask)
: index_(0), indices_(ranges.size(), 0), ranges_(ranges), : index_(0), indices_(ranges.size(), 0), ranges_(ranges),
valid_(true) valid_(true)
{ {
@ -155,7 +155,7 @@ class CutIndexer
assert (ranges.size() == mask.size()); assert (ranges.size() == mask.size());
} }
CutIndexer (const Ranges& ranges, size_t dim) MapIndexer (const Ranges& ranges, size_t dim)
: index_(0), indices_(ranges.size(), 0), ranges_(ranges), : index_(0), indices_(ranges.size(), 0), ranges_(ranges),
valid_(true) valid_(true)
{ {
@ -170,7 +170,7 @@ class CutIndexer
} }
template <typename T> template <typename T>
CutIndexer ( MapIndexer (
const vector<T>& allArgs, const vector<T>& allArgs,
const Ranges& allRanges, const Ranges& allRanges,
const vector<T>& wantedArgs, const vector<T>& wantedArgs,
@ -191,7 +191,7 @@ class CutIndexer
} }
} }
CutIndexer& operator++ (void) MapIndexer& operator++ (void)
{ {
assert (valid_); assert (valid_);
for (size_t i = ranges_.size(); i-- > 0; ) { for (size_t i = ranges_.size(); i-- > 0; ) {
@ -232,7 +232,7 @@ class CutIndexer
index_ = 0; index_ = 0;
} }
friend std::ostream& operator<< (std::ostream&, const CutIndexer&); friend std::ostream& operator<< (std::ostream&, const MapIndexer&);
private: private:
size_t index_; size_t index_;
@ -245,7 +245,7 @@ class CutIndexer
inline std::ostream& inline std::ostream&
operator<< (std::ostream &os, const CutIndexer& indexer) operator<< (std::ostream &os, const MapIndexer& indexer)
{ {
os << "(" ; os << "(" ;
os << std::setw (2) << std::setfill('0') << indexer.index_; os << std::setw (2) << std::setfill('0') << indexer.index_;

10
packages/CLPBN/horus/Parfactor.cpp
View File

@ -228,11 +228,11 @@ Parfactor::countConvert (LogVar X)
params_.reserve (sumout.size() * H); params_.reserve (sumout.size() * H);
ranges_[fIdx] = H; ranges_[fIdx] = H;
CutIndexer cutIndexer (ranges_, fIdx); MapIndexer mapIndexer (ranges_, fIdx);
while (cutIndexer.valid()) { while (mapIndexer.valid()) {
double prod = LogAware::multIdenty(); double prod = LogAware::multIdenty();
size_t i = cutIndexer; size_t i = mapIndexer;
unsigned h = cutIndexer[fIdx]; unsigned h = mapIndexer[fIdx];
for (unsigned r = 0; r < R; r++) { for (unsigned r = 0; r < R; r++) {
if (Globals::logDomain) { if (Globals::logDomain) {
prod += LogAware::pow (sumout[i][r], histograms[h][r]); prod += LogAware::pow (sumout[i][r], histograms[h][r]);
@ -241,7 +241,7 @@ Parfactor::countConvert (LogVar X)
} }
} }
params_.push_back (prod); params_.push_back (prod);
++ cutIndexer; ++ mapIndexer;
} }
args_[fIdx].setCountedLogVar (X); args_[fIdx].setCountedLogVar (X);
simplifyCountingFormulas (fIdx); simplifyCountingFormulas (fIdx);