diff options
| author | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-12-11 04:59:26 +0300 |
|---|---|---|
| committer | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-12-11 04:59:26 +0300 |
| commit | 40ed3df9cb513681569a2fcde32a5215c38253f3 (patch) | |
| tree | 00edc16cc3858bed1bde3ddaa470cf58b80da742 /moses/ChartParser.cpp | |
| parent | 29694af6e43c1cec7a6fd0b157eb44faca706129 (diff) | |
| parent | 739165c2b05dd3a423fedc6d14afcbf5ffe302e2 (diff) | |
Merge branch 'master' of https://github.com/moses-smt/mosesdecoder
Conflicts:
moses/ChartParser.cpp
moses/ChartParser.h
moses/ConfusionNet.h
moses/FF/CountNonTerms.cpp
moses/FF/CountNonTerms.h
moses/FF/SoftSourceSyntacticConstraintsFeature.cpp
moses/FF/SoftSourceSyntacticConstraintsFeature.h
moses/FF/SourceGHKMTreeInputMatchFeature.cpp
moses/FF/SourceGHKMTreeInputMatchFeature.h
moses/ForestInput.cpp
moses/InputType.h
moses/MockHypothesis.cpp
moses/Sentence.cpp
moses/Sentence.h
moses/StaticData.cpp
moses/StaticData.h
moses/Syntax/F2S/GlueRuleSynthesizer.h
moses/Syntax/T2S/GlueRuleSynthesizer.cpp
moses/Syntax/T2S/GlueRuleSynthesizer.h
moses/TreeInput.cpp
moses/XmlOption.cpp
moses/XmlOption.h
Diffstat (limited to 'moses/ChartParser.cpp')
| -rw-r--r-- | moses/ChartParser.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/moses/ChartParser.cpp b/moses/ChartParser.cpp index e0c84e199..60899c02d 100644 --- a/moses/ChartParser.cpp +++ b/moses/ChartParser.cpp @@ -46,21 +46,21 @@ ChartParserUnknown::~ChartParserUnknown() RemoveAllInColl(m_unksrcs); } -AllOptions::ptr const& +AllOptions::ptr const& ChartParserUnknown:: -options() const -{ - return m_ttask.lock()->options(); -} +options() const +{ + return m_ttask.lock()->options(); +} -void +void ChartParserUnknown:: Process(const Word &sourceWord, const Range &range, ChartParserCallback &to) { // unknown word, add as trans opt const StaticData &staticData = StaticData::Instance(); - const UnknownWordPenaltyProducer &unknownWordPenaltyProducer - = UnknownWordPenaltyProducer::Instance(); + const UnknownWordPenaltyProducer &unknownWordPenaltyProducer + = UnknownWordPenaltyProducer::Instance(); size_t isDigit = 0; if (options()->unk.drop) { @@ -100,8 +100,8 @@ Process(const Word &sourceWord, const Range &range, ChartParserCallback &to) //const Word &sourceLHS = staticData.GetInputDefaultNonTerminal(); Word *targetLHS = new Word(true); - targetLHS->CreateFromString(Output, options()->output.factor_order, - targetLHSStr, true); + targetLHS->CreateFromString(Output, options()->output.factor_order, + targetLHSStr, true); UTIL_THROW_IF2(targetLHS->GetFactor(0) == NULL, "Null factor for target LHS"); // add to dictionary @@ -141,8 +141,8 @@ Process(const Word &sourceWord, const Range &range, ChartParserCallback &to) //float prob = iterLHS->second; Word *targetLHS = new Word(true); - targetLHS->CreateFromString(Output, staticData.options()->output.factor_order, - targetLHSStr, true); + targetLHS->CreateFromString(Output, staticData.options()->output.factor_order, + targetLHSStr, true); UTIL_THROW_IF2(targetLHS->GetFactor(0) == NULL, "Null factor for target LHS"); targetPhrase->GetScoreBreakdown().Assign(&unknownWordPenaltyProducer, unknownScore); @@ -299,12 +299,12 @@ long ChartParser::GetTranslationId() const } -AllOptions::ptr const& +AllOptions::ptr const& ChartParser:: -options() const -{ - return m_ttask.lock()->options(); -} +options() const +{ + return m_ttask.lock()->options(); +} } // namespace Moses |