This commit is contained in:
Tiago Gomes 2013-02-13 15:25:55 +00:00
parent bd70033c06
commit afd26ed9b4
3 changed files with 13 additions and 14 deletions

View File

@ -151,8 +151,8 @@ Indexer::valid (void) const
inline void
Indexer::reset (void)
{
std::fill (indices_.begin(), indices_.end(), 0);
index_ = 0;
std::fill (indices_.begin(), indices_.end(), 0);
}
@ -208,9 +208,9 @@ class MapIndexer {
template <typename T>
MapIndexer (
const std::vector<T>& allArgs,
const Ranges& allRanges,
const Ranges& allRanges,
const std::vector<T>& wantedArgs,
const Ranges& wantedRanges);
const Ranges& wantedRanges);
MapIndexer& operator++ (void);
@ -274,11 +274,11 @@ MapIndexer::MapIndexer (const Ranges& ranges, size_t dim)
template <typename T> inline
MapIndexer::MapIndexer (
const std::vector<T>& allArgs,
const Ranges& allRanges,
const Ranges& allRanges,
const std::vector<T>& wantedArgs,
const Ranges& wantedRanges)
: index_(0), indices_(allArgs.size(), 0), ranges_(allRanges),
valid_(true)
const Ranges& wantedRanges)
: index_(0), indices_(allArgs.size(), 0), ranges_(allRanges),
valid_(true)
{
size_t prod = 1;
std::vector<size_t> offsets (wantedRanges.size());
@ -345,8 +345,8 @@ MapIndexer::valid (void) const
inline void
MapIndexer::reset (void)
{
std::fill (indices_.begin(), indices_.end(), 0);
index_ = 0;
std::fill (indices_.begin(), indices_.end(), 0);
}

View File

@ -37,8 +37,10 @@ class LiftedOperator {
class ProductOperator : public LiftedOperator {
public:
ProductOperator (
ParfactorList::iterator g1, ParfactorList::iterator g2,
ParfactorList& pfList) : g1_(g1), g2_(g2), pfList_(pfList) { }
ParfactorList::iterator g1,
ParfactorList::iterator g2,
ParfactorList& pfList)
: g1_(g1), g2_(g2), pfList_(pfList) { }
double getLogCost (void);

View File

@ -15,10 +15,7 @@ namespace Horus {
class Parfactor : public TFactor<ProbFormula> {
public:
Parfactor (
const ProbFormulas&,
const Params&,
const Tuples&,
Parfactor (const ProbFormulas&, const Params&, const Tuples&,
unsigned distId);
Parfactor (const Parfactor*, const Tuple&);