moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-09-11 19:27:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Nicola Bertoldi 2014-08-18 19:13:51 +02:00
parent 5b7096f005
commit 77e9e91b08
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moses/FF/DynamicCacheBasedLanguageModel.cpp
View File

@ -118,7 +118,7 @@ float DynamicCacheBasedLanguageModel::Evaluate_Whole_String(const TargetPhrase&
size_t endpos = tp.GetSize();
for (size_t pos = 0 ; pos < endpos ; ++pos) {
w += tp.GetWord(pos).GetFactor(0)->GetString().as_string();
if ((pos == 0) && (endpos > 1)) {
if (pos < endpos - 1) {
w += " ";
}
}

30
moses/TranslationModel/PhraseDictionaryDynamicCacheBased.cpp
View File

@ -53,10 +53,6 @@ PhraseDictionaryDynamicCacheBased::PhraseDictionaryDynamicCacheBased(const std::
UTIL_THROW_IF2(s_instance_map.find(m_name) != s_instance_map.end(), "Only 1 PhraseDictionaryDynamicCacheBased feature named " + m_name + " is allowed");
s_instance_map[m_name] = this;
s_instance = this; //for back compatibility
SetFeaturesToApply();
vector<float> weight = StaticData::Instance().GetWeights(this);
SetPreComputedScores(weight.size());
}
PhraseDictionaryDynamicCacheBased::~PhraseDictionaryDynamicCacheBased()
@ -67,9 +63,11 @@ PhraseDictionaryDynamicCacheBased::~PhraseDictionaryDynamicCacheBased()
void PhraseDictionaryDynamicCacheBased::Load()
{
VERBOSE(2,"PhraseDictionaryDynamicCacheBased::Load()" << std::endl);
// SetFeaturesToApply();
// vector<float> weight = StaticData::Instance().GetWeights(this);
// SetPreComputedScores(weight.size());
SetFeaturesToApply();
vector<float> weight = StaticData::Instance().GetWeights(this);
SetPreComputedScores(weight.size());
Load(m_initfiles);
}
@ -175,18 +173,24 @@ const TargetPhraseCollection *PhraseDictionaryDynamicCacheBased::GetTargetPhrase
return tpc;
}
const TargetPhraseCollection* PhraseDictionaryDynamicCacheBased::GetTargetPhraseCollectionLEGACY(Phrase const &src) const
{
const TargetPhraseCollection *ret = GetTargetPhraseCollection(src);
return ret;
}
const TargetPhraseCollection* PhraseDictionaryDynamicCacheBased::GetTargetPhraseCollectionNonCacheLEGACY(Phrase const &src) const
{
const TargetPhraseCollection *ret = GetTargetPhraseCollection(src);
return ret;
const TargetPhraseCollection *ret = GetTargetPhraseCollection(src);
return ret;
}
ChartRuleLookupManager* PhraseDictionaryDynamicCacheBased::CreateRuleLookupManager(const ChartParser &parser, const ChartCellCollectionBase &cellCollection, std::size_t /*maxChartSpan*/)
{
UTIL_THROW(util::Exception, "Phrase table used in chart decoder");
UTIL_THROW(util::Exception, "Phrase table used in chart decoder");
}
void PhraseDictionaryDynamicCacheBased::SetScoreType(size_t type)
{
#ifdef WITH_THREADS

1
moses/TranslationModel/PhraseDictionaryDynamicCacheBased.h
View File

@ -107,6 +107,7 @@ public:
void Load(const std::string files);
const TargetPhraseCollection* GetTargetPhraseCollection(const Phrase &src) const;
const TargetPhraseCollection* GetTargetPhraseCollectionLEGACY(Phrase const &src) const;
const TargetPhraseCollection* GetTargetPhraseCollectionNonCacheLEGACY(Phrase const &src) const;
// for phrase-based model