Merge branch 'master' of github.com:moses-smt/mosesdecoder

This commit is contained in:
Hieu Hoang 2015-10-16 19:16:14 +00:00
commit 9209101292
3 changed files with 17 additions and 2 deletions

View File

@ -314,7 +314,7 @@ struct CompareHypothesisTotalScore {
ObjectPool<Hypothesis> &pool = Hypothesis::GetObjectPool(); \
pool.freeObject(hypo); \
} \
#else
#define FREEHYPO(hypo) delete hypo
#endif

View File

@ -68,6 +68,13 @@ public:
else return state.compare(o.state);
}
virtual size_t hash() const {
UTIL_THROW2("TODO:Haven't figure this out yet");
}
virtual bool operator==(const FFState& other) const {
UTIL_THROW2("TODO:Haven't figure this out yet");
}
DALM::State &get_state() {
return state;
}
@ -178,6 +185,14 @@ public:
if(rightContext.get_count() > o.rightContext.get_count()) return 1;
return rightContext.compare(o.rightContext);
}
virtual size_t hash() const {
UTIL_THROW2("TODO:Haven't figure this out yet");
}
virtual bool operator==(const FFState& other) const {
UTIL_THROW2("TODO:Haven't figure this out yet");
}
};
LanguageModelDALM::LanguageModelDALM(const std::string &line)

View File

@ -428,7 +428,7 @@ inline float CalcTranslationScore(const std::vector<float> &probVector,
out << *this; \
return out.str(); \
} \
//! delete and remove every element of a collection object such as set, list etc
template<class COLL>
void RemoveAllInColl(COLL &coll)