moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-10-05 15:58:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

extend FF framework by add StackVec* argument to 2nd Evaluate(). NULL if phrase-based

Browse Source
This commit is contained in:
Hieu Hoang 2014-05-08 17:51:45 +01:00
parent 3ef5d76860
commit 15566f7fc5
48 changed files with 86 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moses/ChartTranslationOption.cpp
View File

@ -10,13 +10,15 @@ ChartTranslationOption::ChartTranslationOption(const TargetPhrase &targetPhrase)
{
}
void ChartTranslationOption::Evaluate(const InputType &input, const InputPath &inputPath)
void ChartTranslationOption::Evaluate(const InputType &input,
const InputPath &inputPath,
const StackVec &stackVec)
{
const std::vector<FeatureFunction*> &ffs = FeatureFunction::GetFeatureFunctions();
for (size_t i = 0; i < ffs.size(); ++i) {
const FeatureFunction &ff = *ffs[i];
ff.Evaluate(input, inputPath, m_targetPhrase, m_scoreBreakdown);
ff.Evaluate(input, inputPath, m_targetPhrase, &stackVec, m_scoreBreakdown);
}
}

5
moses/ChartTranslationOption.h
View File

@ -7,6 +7,7 @@ namespace Moses
class TargetPhrase;
class InputPath;
class InputType;
class StackVec;
class ChartTranslationOption
{
@ -43,7 +44,9 @@ public:
return m_scoreBreakdown;
}
void Evaluate(const InputType &input, const InputPath &inputPath);
void Evaluate(const InputType &input,
const InputPath &inputPath,
const StackVec &stackVec);
};
}

2
moses/ChartTranslationOptions.cpp
View File

@ -62,7 +62,7 @@ void ChartTranslationOptions::Evaluate(const InputType &input, const InputPath &
for (iter = m_collection.begin(); iter != m_collection.end(); ++iter) {
ChartTranslationOption &transOpt = **iter;
transOpt.SetInputPath(&inputPath);
transOpt.Evaluate(input, inputPath);
transOpt.Evaluate(input, inputPath, m_stackVec);
}
}

1
moses/FF/BleuScoreFeature.h
View File

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

1
moses/FF/ConstrainedDecoding.h
View File

@ -49,6 +49,7 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}

1
moses/FF/ControlRecombination.h
View File

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

1
moses/FF/CountNonTerms.h
View File

@ -20,6 +20,7 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}

1
moses/FF/CoveredReferenceFeature.cpp
View File

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

1
moses/FF/CoveredReferenceFeature.h
View File

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

1
moses/FF/DecodeFeature.h
View File

@ -70,6 +70,7 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}

1
moses/FF/DistortionScoreProducer.h
View File

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

1
moses/FF/ExternalFeature.h
View File

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

2
moses/FF/FeatureFunction.h
View File

@ -20,6 +20,7 @@ class WordsBitmap;
class WordsRange;
class FactorMask;
class InputPath;
class StackVec;
/** base class for all feature functions.
*/
@ -110,6 +111,7 @@ public:
virtual void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const = 0;

1
moses/FF/GlobalLexicalModel.h
View File

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

1
moses/FF/GlobalLexicalModelUnlimited.h
View File

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

1
moses/FF/HyperParameterAsWeight.h
View File

@ -26,6 +26,7 @@ public:
virtual void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}

1
moses/FF/InputFeature.cpp
View File

@ -47,6 +47,7 @@ void InputFeature::SetParameter(const std::string& key, const std::string& value
void InputFeature::Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore) const
{

1
moses/FF/InputFeature.h
View File

@ -49,6 +49,7 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const;

1
moses/FF/InternalStructStatelessFF.cpp
View File

@ -18,6 +18,7 @@ void InternalStructStatelessFF::Evaluate(const Phrase &source
void InternalStructStatelessFF::Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore) const
{

1
moses/FF/InternalStructStatelessFF.h
View File

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

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

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

34
moses/FF/MaxSpanFreeNonTermSource.cpp
View File

@ -3,6 +3,10 @@
#include "moses/StaticData.h"
#include "moses/Word.h"
#include "moses/InputPath.h"
#include "moses/TargetPhrase.h"
#include "moses/StackVec.h"
#include "moses/WordsRange.h"
#include "moses/ChartCellLabel.h"
using namespace std;
@ -21,19 +25,39 @@ void MaxSpanFreeNonTermSource::Evaluate(const Phrase &source
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection &estimatedFutureScore) const
{
float score = 0;
scoreBreakdown.PlusEquals(this, score);
targetPhrase.SetRuleSource(source);
}
void MaxSpanFreeNonTermSource::Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore) const
{
cerr << "inputPath=" << inputPath.GetPhrase() << endl;
const Phrase *source = targetPhrase.GetRuleSource();
assert(source);
cerr << "stackVec=" << stackVec->size() << " source="<< *source << endl;
float score = 0;
if (source->Front().IsNonTerminal()) {
const ChartCellLabel &cell = *stackVec->front();
if (cell.GetCoverage().GetNumWordsCovered() > m_maxSpan) {
score = - std::numeric_limits<float>::infinity();
}
}
if (source->Back().IsNonTerminal()) {
const ChartCellLabel &cell = *stackVec->back();
if (cell.GetCoverage().GetNumWordsCovered() > m_maxSpan) {
score = - std::numeric_limits<float>::infinity();
}
}
scoreBreakdown.PlusEquals(this, score);
}

1
moses/FF/MaxSpanFreeNonTermSource.h
View File

@ -22,6 +22,7 @@ public:
virtual void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const;

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

@ -42,6 +42,7 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}

1
moses/FF/PhraseBoundaryFeature.h
View File

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

1
moses/FF/PhraseLengthFeature.h
View File

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

1
moses/FF/PhrasePairFeature.h
View File

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

1
moses/FF/PhrasePenalty.h
View File

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

1
moses/FF/ReferenceComparison.h
View File

@ -24,6 +24,7 @@ public:
virtual void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}

1
moses/FF/RuleAmbiguity.h
View File

@ -22,6 +22,7 @@ public:
virtual void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}

1
moses/FF/SetSourcePhrase.h
View File

@ -22,6 +22,7 @@ public:
virtual void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}

1
moses/FF/SkeletonStatefulFF.cpp
View File

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

1
moses/FF/SkeletonStatefulFF.h
View File

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

1
moses/FF/SkeletonStatelessFF.cpp
View File

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

1
moses/FF/SkeletonStatelessFF.h
View File

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

1
moses/FF/SoftMatchingFeature.h
View File

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

1
moses/FF/SourceWordDeletionFeature.h
View File

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

1
moses/FF/TargetBigramFeature.h
View File

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

1
moses/FF/TargetNgramFeature.h
View File

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

1
moses/FF/TargetWordInsertionFeature.h
View File

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

1
moses/FF/TreeStructureFeature.h
View File

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

1
moses/FF/UnknownWordPenaltyProducer.h
View File

@ -40,6 +40,7 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}

1
moses/FF/WordPenaltyProducer.h
View File

@ -40,6 +40,7 @@ public:
void Evaluate(const InputType &input
, const InputPath &inputPath
, const TargetPhrase &targetPhrase
, const StackVec *stackVec
, ScoreComponentCollection &scoreBreakdown
, ScoreComponentCollection *estimatedFutureScore = NULL) const
{}

1
moses/FF/WordTranslationFeature.h
View File

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

1
moses/LM/Base.h
View File

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

1
moses/ScoreComponentCollectionTest.cpp
View File

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

5
moses/StackVec.h
View File

@ -26,6 +26,9 @@ namespace Moses
class ChartCellLabel;
typedef std::vector<const ChartCellLabel*> StackVec;
class StackVec : public std::vector<const ChartCellLabel*>
{
};
}

2
moses/TargetPhrase.cpp
View File

@ -146,7 +146,7 @@ void TargetPhrase::Evaluate(const InputType &input, const InputPath &inputPath)
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, &futureScoreBreakdown);
ff.Evaluate(input, inputPath, *this, NULL, m_scoreBreakdown, &futureScoreBreakdown);
}
}
float weightedScore = m_scoreBreakdown.GetWeightedScore();