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

modified FF interface: Evaluate() with input has access to future-cost estimation

Browse Source
This commit is contained in:
Ales Tamchyna 2013-12-03 16:50:41 +01:00
parent fec97d2073
commit cd63f30f15
35 changed files with 73 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moses/FF/BleuScoreFeature.h
View File

@ -124,7 +124,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Phrase &source
, const TargetPhrase &targetPhrase

3
moses/FF/ConstrainedDecoding.h
View File

@ -54,7 +54,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
FFState* Evaluate(
const Hypothesis& cur_hypo,

3
moses/FF/ControlRecombination.h
View File

@ -65,7 +65,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
FFState* Evaluate(
const Hypothesis& cur_hypo,

3
moses/FF/CoveredReferenceFeature.cpp
View File

@ -49,7 +49,8 @@ void CoveredReferenceFeature::Evaluate(const Phrase &source
void CoveredReferenceFeature::Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore) const
{}
void CoveredReferenceFeature::Load() {

3
moses/FF/CoveredReferenceFeature.h
View File

@ -59,7 +59,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const;
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const;
FFState* Evaluate(
const Hypothesis& cur_hypo,
const FFState* prev_state,

3
moses/FF/DecodeFeature.h
View File

@ -69,7 +69,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Phrase &source
, const TargetPhrase &targetPhrase

3
moses/FF/DistortionScoreProducer.h
View File

@ -43,7 +43,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Phrase &source
, const TargetPhrase &targetPhrase

3
moses/FF/ExternalFeature.h
View File

@ -59,7 +59,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
FFState* Evaluate(
const Hypothesis& cur_hypo,

4
moses/FF/FeatureFunction.h
View File

@ -105,10 +105,12 @@ public:
// just before search.
// 'inputPath' is guaranteed to be the raw substring from the input. No factors were added or taken away
// Currently not used by any FF. Not called by moses_chart
// No FF should set estimatedFutureScore in both overloads!
virtual void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const = 0;
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const = 0;
virtual void SetParameter(const std::string& key, const std::string& value);
virtual void ReadParameters();

3
moses/FF/GlobalLexicalModel.h
View File

@ -83,7 +83,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Phrase &source
, const TargetPhrase &targetPhrase

3
moses/FF/GlobalLexicalModelUnlimited.h
View File

@ -93,7 +93,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Phrase &source
, const TargetPhrase &targetPhrase

3
moses/FF/InputFeature.cpp
View File

@ -39,7 +39,8 @@ void InputFeature::SetParameter(const std::string& key, const std::string& value
void InputFeature::Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore) const
{
if (m_legacy) {
//binary phrase-table does input feature itself

3
moses/FF/InputFeature.h
View File

@ -40,7 +40,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const;
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const;
void Evaluate(const Hypothesis& hypo,
ScoreComponentCollection* accumulator) const

3
moses/FF/InternalStructStatelessFF.cpp
View File

@ -18,7 +18,8 @@ void InternalStructStatelessFF::Evaluate(const Phrase &source
void InternalStructStatelessFF::Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore) const
{
cerr << "HHHHH" << scoreBreakdown << endl;

3
moses/FF/InternalStructStatelessFF.h
View File

@ -24,7 +24,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const;
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const;
virtual void Evaluate(const Hypothesis& hypo,
ScoreComponentCollection* accumulator) const
{}

3
moses/FF/LexicalReordering/LexicalReordering.h
View File

@ -54,7 +54,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Phrase &source
, const TargetPhrase &targetPhrase

3
moses/FF/OSM-Feature/OpSequenceModel.h
View File

@ -41,7 +41,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Phrase &source
, const TargetPhrase &targetPhrase

3
moses/FF/PhraseBoundaryFeature.h
View File

@ -56,7 +56,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Phrase &source
, const TargetPhrase &targetPhrase

3
moses/FF/PhraseLengthFeature.h
View File

@ -36,7 +36,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
virtual void Evaluate(const Phrase &source

3
moses/FF/PhrasePairFeature.h
View File

@ -48,7 +48,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Phrase &source
, const TargetPhrase &targetPhrase

3
moses/FF/PhrasePenalty.h
View File

@ -29,7 +29,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
};

3
moses/FF/SkeletonStatefulFF.cpp
View File

@ -25,7 +25,8 @@ void SkeletonStatefulFF::Evaluate(const Phrase &source
void SkeletonStatefulFF::Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore) const
{}
FFState* SkeletonStatefulFF::Evaluate(

3
moses/FF/SkeletonStatefulFF.h
View File

@ -39,7 +39,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const;
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const;
FFState* Evaluate(
const Hypothesis& cur_hypo,
const FFState* prev_state,

3
moses/FF/SkeletonStatelessFF.cpp
View File

@ -25,7 +25,8 @@ void SkeletonStatelessFF::Evaluate(const Phrase &source
void SkeletonStatelessFF::Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore) const
{}
void SkeletonStatelessFF::Evaluate(const Hypothesis& hypo,

3
moses/FF/SkeletonStatelessFF.h
View File

@ -24,7 +24,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const;
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const;
void Evaluate(const Hypothesis& hypo,
ScoreComponentCollection* accumulator) const;
void EvaluateChart(const ChartHypothesis &hypo,

3
moses/FF/SourceWordDeletionFeature.h
View File

@ -35,7 +35,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Hypothesis& hypo,
ScoreComponentCollection* accumulator) const

3
moses/FF/TargetBigramFeature.h
View File

@ -50,7 +50,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Phrase &source
, const TargetPhrase &targetPhrase

3
moses/FF/TargetNgramFeature.h
View File

@ -195,7 +195,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Phrase &source
, const TargetPhrase &targetPhrase

3
moses/FF/TargetWordInsertionFeature.h
View File

@ -35,7 +35,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Hypothesis& hypo,
ScoreComponentCollection* accumulator) const

3
moses/FF/UnknownWordPenaltyProducer.h
View File

@ -30,7 +30,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Phrase &source
, const TargetPhrase &targetPhrase

3
moses/FF/WordPenaltyProducer.h
View File

@ -30,7 +30,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
};

3
moses/FF/WordTranslationFeature.h
View File

@ -56,7 +56,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
void Evaluate(const Phrase &source
, const TargetPhrase &targetPhrase

3
moses/LM/Base.h
View File

@ -94,7 +94,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}
};

3
moses/ScoreComponentCollectionTest.cpp
View File

@ -39,7 +39,8 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, ScoreComponentCollection &scoreBreakdown) const
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore) const
{}
void Evaluate(const Phrase &source
, const TargetPhrase &targetPhrase

4
moses/TargetPhrase.cpp
View File

@ -142,12 +142,16 @@ void TargetPhrase::Evaluate(const InputType &input, const InputPath &inputPath)
{
const std::vector<FeatureFunction*> &ffs = FeatureFunction::GetFeatureFunctions();
const StaticData &staticData = StaticData::Instance();
ScoreComponentCollection futureScoreBreakdown;
for (size_t i = 0; i < ffs.size(); ++i) {
const FeatureFunction &ff = *ffs[i];
if (! staticData.IsFeatureFunctionIgnored( ff )) {
ff.Evaluate(input, inputPath, *this, m_scoreBreakdown);
}
}
float weightedScore = m_scoreBreakdown.GetWeightedScore();
m_futureScore += futureScoreBreakdown.GetWeightedScore();
m_fullScore = weightedScore + m_futureScore;
}
void TargetPhrase::SetXMLScore(float score)