moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-12-26 13:23:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

figure out which feature function to apply at which decode step. Book-keeping

Browse Source
This commit is contained in:
Hieu Hoang 2013-05-30 23:59:29 +01:00
parent 9c81696143
commit d9bd7dc818
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moses/DecodeStepTranslation.cpp
View File

@ -84,10 +84,9 @@ void DecodeStepTranslation::Process(const TranslationOption &inputPartialTranslO
continue;
}
outPhrase.GetScoreBreakdown().PlusEquals(transScores);
outPhrase.Evaluate(src); // need to do this as all non-transcores would be screwed up
outPhrase.Merge(targetPhrase, m_newOutputFactors);
outPhrase.Evaluate(src, m_featuresToApply); // need to do this as all non-transcores would be screwed up
outPhrase.MergeFactors(targetPhrase, m_newOutputFactors);
TranslationOption *newTransOpt = new TranslationOption(sourceWordsRange, outPhrase);
assert(newTransOpt != NULL);

10
moses/TargetPhrase.cpp
View File

@ -123,10 +123,8 @@ void TargetPhrase::Evaluate(const Phrase &source, const std::vector<FeatureFunct
}
float weightedScore = m_scoreBreakdown.GetWeightedScore();
//m_futureScore += futureScoreBreakdown.GetWeightedScore();
//m_fullScore = weightedScore + m_futureScore;
float futureScore = futureScoreBreakdown.GetWeightedScore();
m_fullScore = weightedScore + futureScore;
m_futureScore += futureScoreBreakdown.GetWeightedScore();
m_fullScore = weightedScore + m_futureScore;
}
}
@ -153,8 +151,6 @@ void TargetPhrase::SetXMLScore(float score)
void TargetPhrase::SetInputScore(const Scores &scoreVector)
{
cerr << scoreVector.size() << endl;
//we use an existing score producer to figure out information for score setting (number of scores and weights)
const StaticData &staticData = StaticData::Instance();
const FeatureFunction* prod = staticData.GetPhraseDictionaries()[0];
@ -215,6 +211,8 @@ void TargetPhrase::Merge(const TargetPhrase &copy, const std::vector<FactorType>
{
Phrase::MergeFactors(copy, factorVec);
m_scoreBreakdown.Merge(copy.GetScoreBreakdown());
m_futureScore += copy.m_futureScore;
m_fullScore += copy.m_fullScore;
}
TO_STRING_BODY(TargetPhrase);