From 80791d1767db8560892b6414721b4ac1cbb1158b Mon Sep 17 00:00:00 2001 From: Hieu Hoang Date: Wed, 26 Apr 2017 13:10:32 +0100 Subject: [PATCH] rename Skeleton... to Example... --- contrib/other-builds/moses/.project | 100 +++++++++--------- ...onStatefulFF.cpp => ExampleStatefulFF.cpp} | 20 ++-- ...eletonStatefulFF.h => ExampleStatefulFF.h} | 12 +-- ...StatelessFF.cpp => ExampleStatelessFF.cpp} | 16 +-- ...etonStatelessFF.h => ExampleStatelessFF.h} | 4 +- moses/FF/Factory.cpp | 16 +-- moses/LM/{SkeletonLM.cpp => ExampleLM.cpp} | 8 +- moses/LM/{SkeletonLM.h => ExampleLM.h} | 6 +- moses/LM/Jamfile | 2 +- ....cpp => ChartRuleLookupManagerExample.cpp} | 20 ++-- ...eton.h => ChartRuleLookupManagerExample.h} | 12 +-- .../{SkeletonPT.cpp => ExamplePT.cpp} | 26 ++--- .../{SkeletonPT.h => ExamplePT.h} | 6 +- .../PhraseDictionaryMemoryPerSentence.cpp | 2 +- ...aseDictionaryMemoryPerSentenceOnDemand.cpp | 1 - .../PhraseDictionaryTransliteration.cpp | 1 - moses/TranslationModel/ProbingPT.cpp | 1 - 17 files changed, 125 insertions(+), 128 deletions(-) rename moses/FF/{SkeletonStatefulFF.cpp => ExampleStatefulFF.cpp} (79%) rename moses/FF/{SkeletonStatefulFF.h => ExampleStatefulFF.h} (90%) rename moses/FF/{SkeletonStatelessFF.cpp => ExampleStatelessFF.cpp} (69%) rename moses/FF/{SkeletonStatelessFF.h => ExampleStatelessFF.h} (92%) rename moses/LM/{SkeletonLM.cpp => ExampleLM.cpp} (84%) rename moses/LM/{SkeletonLM.h => ExampleLM.h} (67%) rename moses/TranslationModel/CYKPlusParser/{ChartRuleLookupManagerSkeleton.cpp => ChartRuleLookupManagerExample.cpp} (86%) rename moses/TranslationModel/CYKPlusParser/{ChartRuleLookupManagerSkeleton.h => ChartRuleLookupManagerExample.h} (85%) rename moses/TranslationModel/{SkeletonPT.cpp => ExamplePT.cpp} (70%) rename moses/TranslationModel/{SkeletonPT.h => ExamplePT.h} (81%) diff --git a/contrib/other-builds/moses/.project b/contrib/other-builds/moses/.project index d7e99c253..68caf84b3 100644 --- a/contrib/other-builds/moses/.project +++ b/contrib/other-builds/moses/.project @@ -1200,6 +1200,26 @@ 1 PARENT-3-PROJECT_LOC/moses/FF/EditOps.h + + FF/ExampleStatefulFF.cpp + 1 + PARENT-3-PROJECT_LOC/moses/FF/ExampleStatefulFF.cpp + + + FF/ExampleStatefulFF.h + 1 + PARENT-3-PROJECT_LOC/moses/FF/ExampleStatefulFF.h + + + FF/ExampleStatelessFF.cpp + 1 + PARENT-3-PROJECT_LOC/moses/FF/ExampleStatelessFF.cpp + + + FF/ExampleStatelessFF.h + 1 + PARENT-3-PROJECT_LOC/moses/FF/ExampleStatelessFF.h + FF/FFState.cpp 1 @@ -1420,26 +1440,6 @@ 1 PARENT-3-PROJECT_LOC/moses/FF/SetSourcePhrase.h - - FF/SkeletonStatefulFF.cpp - 1 - PARENT-3-PROJECT_LOC/moses/FF/SkeletonStatefulFF.cpp - - - FF/SkeletonStatefulFF.h - 1 - PARENT-3-PROJECT_LOC/moses/FF/SkeletonStatefulFF.h - - - FF/SkeletonStatelessFF.cpp - 1 - PARENT-3-PROJECT_LOC/moses/FF/SkeletonStatelessFF.cpp - - - FF/SkeletonStatelessFF.h - 1 - PARENT-3-PROJECT_LOC/moses/FF/SkeletonStatelessFF.h - FF/SoftMatchingFeature.cpp 1 @@ -1695,6 +1695,16 @@ 1 PARENT-3-PROJECT_LOC/moses/LM/DALMWrapper.h + + LM/ExampleLM.cpp + 1 + PARENT-3-PROJECT_LOC/moses/LM/ExampleLM.cpp + + + LM/ExampleLM.h + 1 + PARENT-3-PROJECT_LOC/moses/LM/ExampleLM.h + LM/IRST.cpp 1 @@ -1845,16 +1855,6 @@ 1 PARENT-3-PROJECT_LOC/moses/LM/SingleFactor.h - - LM/SkeletonLM.cpp - 1 - PARENT-3-PROJECT_LOC/moses/LM/SkeletonLM.cpp - - - LM/SkeletonLM.h - 1 - PARENT-3-PROJECT_LOC/moses/LM/SkeletonLM.h - LM/backward.arpa 1 @@ -2140,6 +2140,16 @@ 2 virtual:/virtual + + TranslationModel/ExamplePT.cpp + 1 + PARENT-3-PROJECT_LOC/moses/TranslationModel/ExamplePT.cpp + + + TranslationModel/ExamplePT.h + 1 + PARENT-3-PROJECT_LOC/moses/TranslationModel/ExamplePT.h + TranslationModel/PhraseDictionary.cpp 1 @@ -2290,16 +2300,6 @@ 2 virtual:/virtual - - TranslationModel/SkeletonPT.cpp - 1 - PARENT-3-PROJECT_LOC/moses/TranslationModel/SkeletonPT.cpp - - - TranslationModel/SkeletonPT.h - 1 - PARENT-3-PROJECT_LOC/moses/TranslationModel/SkeletonPT.h - TranslationModel/UG 2 @@ -3135,6 +3135,16 @@ 1 PARENT-3-PROJECT_LOC/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerCYKPlus.h + + TranslationModel/CYKPlusParser/ChartRuleLookupManagerExample.cpp + 1 + PARENT-3-PROJECT_LOC/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerExample.cpp + + + TranslationModel/CYKPlusParser/ChartRuleLookupManagerExample.h + 1 + PARENT-3-PROJECT_LOC/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerExample.h + TranslationModel/CYKPlusParser/ChartRuleLookupManagerMemory.cpp 1 @@ -3165,16 +3175,6 @@ 1 PARENT-3-PROJECT_LOC/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerOnDisk.h - - TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.cpp - 1 - PARENT-3-PROJECT_LOC/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.cpp - - - TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.h - 1 - PARENT-3-PROJECT_LOC/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.h - TranslationModel/CYKPlusParser/CompletedRuleCollection.cpp 1 diff --git a/moses/FF/SkeletonStatefulFF.cpp b/moses/FF/ExampleStatefulFF.cpp similarity index 79% rename from moses/FF/SkeletonStatefulFF.cpp rename to moses/FF/ExampleStatefulFF.cpp index 2acaf2d2e..5a53c4f87 100644 --- a/moses/FF/SkeletonStatefulFF.cpp +++ b/moses/FF/ExampleStatefulFF.cpp @@ -1,5 +1,5 @@ #include -#include "SkeletonStatefulFF.h" +#include "ExampleStatefulFF.h" #include "moses/ScoreComponentCollection.h" #include "moses/Hypothesis.h" @@ -9,7 +9,7 @@ namespace Moses { //////////////////////////////////////////////////////////////// -SkeletonStatefulFF::SkeletonStatefulFF(const std::string &line) +ExampleStatefulFF::ExampleStatefulFF(const std::string &line) :StatefulFeatureFunction(3, line) { ReadParameters(); @@ -19,7 +19,7 @@ SkeletonStatefulFF::SkeletonStatefulFF(const std::string &line) // An empty implementation of this function is provided by StatefulFeatureFunction. // Unless you are actually implementing this, please remove it from your // implementation (and the declaration in the header file to reduce code clutter. -void SkeletonStatefulFF::EvaluateInIsolation(const Phrase &source +void ExampleStatefulFF::EvaluateInIsolation(const Phrase &source , const TargetPhrase &targetPhrase , ScoreComponentCollection &scoreBreakdown , ScoreComponentCollection &estimatedScores) const @@ -28,7 +28,7 @@ void SkeletonStatefulFF::EvaluateInIsolation(const Phrase &source // An empty implementation of this function is provided by StatefulFeatureFunction. // Unless you are actually implementing this, please remove it from your // implementation (and the declaration in the header file to reduce code clutter. -void SkeletonStatefulFF::EvaluateWithSourceContext(const InputType &input +void ExampleStatefulFF::EvaluateWithSourceContext(const InputType &input , const InputPath &inputPath , const TargetPhrase &targetPhrase , const StackVec *stackVec @@ -39,11 +39,11 @@ void SkeletonStatefulFF::EvaluateWithSourceContext(const InputType &input // An empty implementation of this function is provided by StatefulFeatureFunction. // Unless you are actually implementing this, please remove it from your // implementation (and the declaration in the header file to reduce code clutter. -void SkeletonStatefulFF::EvaluateTranslationOptionListWithSourceContext +void ExampleStatefulFF::EvaluateTranslationOptionListWithSourceContext (const InputType &input, const TranslationOptionList &translationOptionList) const {} -FFState* SkeletonStatefulFF::EvaluateWhenApplied( +FFState* ExampleStatefulFF::EvaluateWhenApplied( const Hypothesis& cur_hypo, const FFState* prev_state, ScoreComponentCollection* accumulator) const @@ -59,18 +59,18 @@ FFState* SkeletonStatefulFF::EvaluateWhenApplied( accumulator->PlusEquals(this, "sparse-name", 2.4); // int targetLen = cur_hypo.GetCurrTargetPhrase().GetSize(); // ??? [UG] - return new SkeletonState(0); + return new ExampleState(0); } -FFState* SkeletonStatefulFF::EvaluateWhenApplied( +FFState* ExampleStatefulFF::EvaluateWhenApplied( const ChartHypothesis& /* cur_hypo */, int /* featureID - used to index the state in the previous hypotheses */, ScoreComponentCollection* accumulator) const { - return new SkeletonState(0); + return new ExampleState(0); } -void SkeletonStatefulFF::SetParameter(const std::string& key, const std::string& value) +void ExampleStatefulFF::SetParameter(const std::string& key, const std::string& value) { if (key == "arg") { // set value here diff --git a/moses/FF/SkeletonStatefulFF.h b/moses/FF/ExampleStatefulFF.h similarity index 90% rename from moses/FF/SkeletonStatefulFF.h rename to moses/FF/ExampleStatefulFF.h index 7544ddd30..d66274295 100644 --- a/moses/FF/SkeletonStatefulFF.h +++ b/moses/FF/ExampleStatefulFF.h @@ -7,11 +7,11 @@ namespace Moses { -class SkeletonState : public FFState +class ExampleState : public FFState { int m_targetLen; public: - SkeletonState(int targetLen) + ExampleState(int targetLen) :m_targetLen(targetLen) { } @@ -19,22 +19,22 @@ public: return (size_t) m_targetLen; } virtual bool operator==(const FFState& o) const { - const SkeletonState& other = static_cast(o); + const ExampleState& other = static_cast(o); return m_targetLen == other.m_targetLen; } }; -class SkeletonStatefulFF : public StatefulFeatureFunction +class ExampleStatefulFF : public StatefulFeatureFunction { public: - SkeletonStatefulFF(const std::string &line); + ExampleStatefulFF(const std::string &line); bool IsUseable(const FactorMask &mask) const { return true; } virtual const FFState* EmptyHypothesisState(const InputType &input) const { - return new SkeletonState(0); + return new ExampleState(0); } // An empty implementation of this function is provided by StatefulFeatureFunction. diff --git a/moses/FF/SkeletonStatelessFF.cpp b/moses/FF/ExampleStatelessFF.cpp similarity index 69% rename from moses/FF/SkeletonStatelessFF.cpp rename to moses/FF/ExampleStatelessFF.cpp index 8474efe76..0e62ad0ad 100644 --- a/moses/FF/SkeletonStatelessFF.cpp +++ b/moses/FF/ExampleStatelessFF.cpp @@ -1,5 +1,5 @@ #include -#include "SkeletonStatelessFF.h" +#include "ExampleStatelessFF.h" #include "moses/ScoreComponentCollection.h" #include "moses/TargetPhrase.h" @@ -7,13 +7,13 @@ using namespace std; namespace Moses { -SkeletonStatelessFF::SkeletonStatelessFF(const std::string &line) +ExampleStatelessFF::ExampleStatelessFF(const std::string &line) :StatelessFeatureFunction(2, line) { ReadParameters(); } -void SkeletonStatelessFF::EvaluateInIsolation(const Phrase &source +void ExampleStatelessFF::EvaluateInIsolation(const Phrase &source , const TargetPhrase &targetPhrase , ScoreComponentCollection &scoreBreakdown , ScoreComponentCollection &estimatedScores) const @@ -29,7 +29,7 @@ void SkeletonStatelessFF::EvaluateInIsolation(const Phrase &source } -void SkeletonStatelessFF::EvaluateWithSourceContext(const InputType &input +void ExampleStatelessFF::EvaluateWithSourceContext(const InputType &input , const InputPath &inputPath , const TargetPhrase &targetPhrase , const StackVec *stackVec @@ -43,20 +43,20 @@ void SkeletonStatelessFF::EvaluateWithSourceContext(const InputType &input } } -void SkeletonStatelessFF::EvaluateTranslationOptionListWithSourceContext(const InputType &input +void ExampleStatelessFF::EvaluateTranslationOptionListWithSourceContext(const InputType &input , const TranslationOptionList &translationOptionList) const {} -void SkeletonStatelessFF::EvaluateWhenApplied(const Hypothesis& hypo, +void ExampleStatelessFF::EvaluateWhenApplied(const Hypothesis& hypo, ScoreComponentCollection* accumulator) const {} -void SkeletonStatelessFF::EvaluateWhenApplied(const ChartHypothesis &hypo, +void ExampleStatelessFF::EvaluateWhenApplied(const ChartHypothesis &hypo, ScoreComponentCollection* accumulator) const {} -void SkeletonStatelessFF::SetParameter(const std::string& key, const std::string& value) +void ExampleStatelessFF::SetParameter(const std::string& key, const std::string& value) { if (key == "arg") { // set value here diff --git a/moses/FF/SkeletonStatelessFF.h b/moses/FF/ExampleStatelessFF.h similarity index 92% rename from moses/FF/SkeletonStatelessFF.h rename to moses/FF/ExampleStatelessFF.h index 0dc46e214..e1f007d21 100644 --- a/moses/FF/SkeletonStatelessFF.h +++ b/moses/FF/ExampleStatelessFF.h @@ -6,10 +6,10 @@ namespace Moses { -class SkeletonStatelessFF : public StatelessFeatureFunction +class ExampleStatelessFF : public StatelessFeatureFunction { public: - SkeletonStatelessFF(const std::string &line); + ExampleStatelessFF(const std::string &line); bool IsUseable(const FactorMask &mask) const { return true; diff --git a/moses/FF/Factory.cpp b/moses/FF/Factory.cpp index 5d37c4fed..de184ee04 100644 --- a/moses/FF/Factory.cpp +++ b/moses/FF/Factory.cpp @@ -65,13 +65,13 @@ #include "SyntaxRHS.h" #include "DeleteRules.h" -#include "moses/FF/SkeletonStatelessFF.h" -#include "moses/FF/SkeletonStatefulFF.h" -#include "moses/LM/SkeletonLM.h" +#include "moses/FF/ExampleStatelessFF.h" +#include "moses/FF/ExampleStatefulFF.h" +#include "moses/LM/ExampleLM.h" #include "moses/LM/InMemoryPerSentenceOnDemandLM.h" #include "moses/FF/SkeletonTranslationOptionListFeature.h" #include "moses/LM/BilingualLM.h" -#include "moses/TranslationModel/SkeletonPT.h" +#include "moses/TranslationModel/ExamplePT.h" #include "moses/Syntax/InputWeightFF.h" #include "moses/Syntax/RuleTableFF.h" @@ -297,12 +297,12 @@ FeatureRegistry::FeatureRegistry() MOSES_FNAME(UnalignedWordCountFeature); MOSES_FNAME(DeleteRules); - MOSES_FNAME(SkeletonStatelessFF); - MOSES_FNAME(SkeletonStatefulFF); - MOSES_FNAME(SkeletonLM); + MOSES_FNAME(ExampleStatelessFF); + MOSES_FNAME(ExampleStatefulFF); + MOSES_FNAME(ExampleLM); MOSES_FNAME(InMemoryPerSentenceOnDemandLM); MOSES_FNAME(SkeletonTranslationOptionListFeature); - MOSES_FNAME(SkeletonPT); + MOSES_FNAME(ExamplePT); MOSES_FNAME(EditOps); MOSES_FNAME(CorrectionPattern); diff --git a/moses/LM/SkeletonLM.cpp b/moses/LM/ExampleLM.cpp similarity index 84% rename from moses/LM/SkeletonLM.cpp rename to moses/LM/ExampleLM.cpp index f944de23a..034afef2e 100644 --- a/moses/LM/SkeletonLM.cpp +++ b/moses/LM/ExampleLM.cpp @@ -1,12 +1,12 @@ -#include "SkeletonLM.h" +#include "ExampleLM.h" #include "moses/FactorCollection.h" using namespace std; namespace Moses { -SkeletonLM::SkeletonLM(const std::string &line) +ExampleLM::ExampleLM(const std::string &line) :LanguageModelSingleFactor(line) { ReadParameters(); @@ -24,11 +24,11 @@ SkeletonLM::SkeletonLM(const std::string &line) m_sentenceEndWord[m_factorType] = m_sentenceEnd; } -SkeletonLM::~SkeletonLM() +ExampleLM::~ExampleLM() { } -LMResult SkeletonLM::GetValue(const vector &contextFactor, State* finalState) const +LMResult ExampleLM::GetValue(const vector &contextFactor, State* finalState) const { LMResult ret; ret.score = contextFactor.size(); diff --git a/moses/LM/SkeletonLM.h b/moses/LM/ExampleLM.h similarity index 67% rename from moses/LM/SkeletonLM.h rename to moses/LM/ExampleLM.h index 988c9def9..292462917 100644 --- a/moses/LM/SkeletonLM.h +++ b/moses/LM/ExampleLM.h @@ -7,13 +7,13 @@ namespace Moses { -class SkeletonLM : public LanguageModelSingleFactor +class ExampleLM : public LanguageModelSingleFactor { protected: public: - SkeletonLM(const std::string &line); - ~SkeletonLM(); + ExampleLM(const std::string &line); + ~ExampleLM(); virtual LMResult GetValue(const std::vector &contextFactor, State* finalState = 0) const; }; diff --git a/moses/LM/Jamfile b/moses/LM/Jamfile index 4eafbd632..0c152d555 100644 --- a/moses/LM/Jamfile +++ b/moses/LM/Jamfile @@ -138,7 +138,7 @@ if $(with-dalm) { #Top-level LM library. If you've added a file that doesn't depend on external #libraries, put it here. -alias LM : Backward.cpp BackwardLMState.cpp Base.cpp BilingualLM.cpp Implementation.cpp InMemoryPerSentenceOnDemandLM.cpp Ken.cpp MultiFactor.cpp Remote.cpp SingleFactor.cpp SkeletonLM.cpp +alias LM : Backward.cpp BackwardLMState.cpp Base.cpp BilingualLM.cpp Implementation.cpp InMemoryPerSentenceOnDemandLM.cpp Ken.cpp MultiFactor.cpp Remote.cpp SingleFactor.cpp ExampleLM.cpp ../../lm//kenlm ..//headers $(dependencies) ; alias macros : : : : $(lmmacros) ; diff --git a/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.cpp b/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerExample.cpp similarity index 86% rename from moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.cpp rename to moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerExample.cpp index ca219f249..6c80e30af 100644 --- a/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.cpp +++ b/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerExample.cpp @@ -18,7 +18,7 @@ ***********************************************************************/ #include -#include "ChartRuleLookupManagerSkeleton.h" +#include "ChartRuleLookupManagerExample.h" #include "DotChartInMemory.h" #include "moses/Util.h" @@ -29,29 +29,29 @@ #include "moses/NonTerminal.h" #include "moses/ChartCellCollection.h" #include "moses/TranslationModel/PhraseDictionaryMemory.h" -#include "moses/TranslationModel/SkeletonPT.h" +#include "moses/TranslationModel/ExamplePT.h" using namespace std; namespace Moses { -ChartRuleLookupManagerSkeleton::ChartRuleLookupManagerSkeleton( +ChartRuleLookupManagerExample::ChartRuleLookupManagerExample( const ChartParser &parser, const ChartCellCollectionBase &cellColl, - const SkeletonPT &skeletonPt) + const ExamplePT &skeletonPt) : ChartRuleLookupManager(parser, cellColl) , m_skeletonPT(skeletonPt) { - cerr << "starting ChartRuleLookupManagerSkeleton" << endl; + cerr << "starting ChartRuleLookupManagerExample" << endl; } -ChartRuleLookupManagerSkeleton::~ChartRuleLookupManagerSkeleton() +ChartRuleLookupManagerExample::~ChartRuleLookupManagerExample() { // RemoveAllInColl(m_tpColl); } -void ChartRuleLookupManagerSkeleton::GetChartRuleCollection( +void ChartRuleLookupManagerExample::GetChartRuleCollection( const InputPath &inputPath, size_t last, ChartParserCallback &outColl) @@ -74,12 +74,12 @@ void ChartRuleLookupManagerSkeleton::GetChartRuleCollection( } TargetPhrase * -ChartRuleLookupManagerSkeleton:: +ChartRuleLookupManagerExample:: CreateTargetPhrase(const Word &sourceWord) const { - // create a target phrase from the 1st word of the source, prefix with 'ChartManagerSkeleton:' + // create a target phrase from the 1st word of the source, prefix with 'ChartManagerExample:' string str = sourceWord.GetFactor(0)->GetString().as_string(); - str = "ChartManagerSkeleton:" + str; + str = "ChartManagerExample:" + str; TargetPhrase *tp = new TargetPhrase(&m_skeletonPT); Word &word = tp->AddWord(); diff --git a/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.h b/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerExample.h similarity index 85% rename from moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.h rename to moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerExample.h index d01f3b9bd..7cc6337fa 100644 --- a/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.h +++ b/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerExample.h @@ -29,16 +29,16 @@ class TargetPhraseCollection; class ChartParserCallback; class DottedRuleColl; class Range; -class SkeletonPT; +class ExamplePT; -class ChartRuleLookupManagerSkeleton : public ChartRuleLookupManager +class ChartRuleLookupManagerExample : public ChartRuleLookupManager { public: - ChartRuleLookupManagerSkeleton(const ChartParser &parser, + ChartRuleLookupManagerExample(const ChartParser &parser, const ChartCellCollectionBase &cellColl, - const SkeletonPT &skeletonPt); + const ExamplePT &skeletonPt); - ~ChartRuleLookupManagerSkeleton(); + ~ChartRuleLookupManagerExample(); virtual void GetChartRuleCollection( const InputPath &inputPath, @@ -50,7 +50,7 @@ private: StackVec m_stackVec; std::vector m_tpColl; - const SkeletonPT &m_skeletonPT; + const ExamplePT &m_skeletonPT; }; } // namespace Moses diff --git a/moses/TranslationModel/SkeletonPT.cpp b/moses/TranslationModel/ExamplePT.cpp similarity index 70% rename from moses/TranslationModel/SkeletonPT.cpp rename to moses/TranslationModel/ExamplePT.cpp index 6b42212f9..198ce2814 100644 --- a/moses/TranslationModel/SkeletonPT.cpp +++ b/moses/TranslationModel/ExamplePT.cpp @@ -1,29 +1,29 @@ // vim:tabstop=2 -#include "SkeletonPT.h" -#include "moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.h" +#include "ExamplePT.h" +#include "moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerExample.h" using namespace std; namespace Moses { -SkeletonPT::SkeletonPT(const std::string &line) +ExamplePT::ExamplePT(const std::string &line) : PhraseDictionary(line, true) { ReadParameters(); } -void SkeletonPT::Load(AllOptions::ptr const& opts) +void ExamplePT::Load(AllOptions::ptr const& opts) { m_options = opts; SetFeaturesToApply(); } -void SkeletonPT::InitializeForInput(ttasksptr const& ttask) +void ExamplePT::InitializeForInput(ttasksptr const& ttask) { ReduceCache(); } -void SkeletonPT::GetTargetPhraseCollectionBatch(const InputPathList &inputPathQueue) const +void ExamplePT::GetTargetPhraseCollectionBatch(const InputPathList &inputPathQueue) const { CacheColl &cache = GetCache(); @@ -46,14 +46,14 @@ void SkeletonPT::GetTargetPhraseCollectionBatch(const InputPathList &inputPathQu } } -TargetPhrase *SkeletonPT::CreateTargetPhrase(const Phrase &sourcePhrase) const +TargetPhrase *ExamplePT::CreateTargetPhrase(const Phrase &sourcePhrase) const { - // create a target phrase from the 1st word of the source, prefix with 'SkeletonPT:' + // create a target phrase from the 1st word of the source, prefix with 'ExamplePT:' assert(sourcePhrase.GetSize()); assert(m_output.size() == 1); string str = sourcePhrase.GetWord(0).GetFactor(0)->GetString().as_string(); - str = "SkeletonPT:" + str; + str = "ExamplePT:" + str; TargetPhrase *tp = new TargetPhrase(this); Word &word = tp->AddWord(); @@ -69,17 +69,17 @@ TargetPhrase *SkeletonPT::CreateTargetPhrase(const Phrase &sourcePhrase) const return tp; } -ChartRuleLookupManager* SkeletonPT::CreateRuleLookupManager(const ChartParser &parser, +ChartRuleLookupManager* ExamplePT::CreateRuleLookupManager(const ChartParser &parser, const ChartCellCollectionBase &cellCollection, std::size_t /*maxChartSpan*/) { - return new ChartRuleLookupManagerSkeleton(parser, cellCollection, *this); + return new ChartRuleLookupManagerExample(parser, cellCollection, *this); } -TO_STRING_BODY(SkeletonPT); +TO_STRING_BODY(ExamplePT); // friend -ostream& operator<<(ostream& out, const SkeletonPT& phraseDict) +ostream& operator<<(ostream& out, const ExamplePT& phraseDict) { return out; } diff --git a/moses/TranslationModel/SkeletonPT.h b/moses/TranslationModel/ExamplePT.h similarity index 81% rename from moses/TranslationModel/SkeletonPT.h rename to moses/TranslationModel/ExamplePT.h index 443f1cc8e..6ec7764c9 100644 --- a/moses/TranslationModel/SkeletonPT.h +++ b/moses/TranslationModel/ExamplePT.h @@ -9,12 +9,12 @@ class ChartParser; class ChartCellCollectionBase; class ChartRuleLookupManager; -class SkeletonPT : public PhraseDictionary +class ExamplePT : public PhraseDictionary { - friend std::ostream& operator<<(std::ostream&, const SkeletonPT&); + friend std::ostream& operator<<(std::ostream&, const ExamplePT&); public: - SkeletonPT(const std::string &line); + ExamplePT(const std::string &line); void Load(AllOptions::ptr const& opts); diff --git a/moses/TranslationModel/PhraseDictionaryMemoryPerSentence.cpp b/moses/TranslationModel/PhraseDictionaryMemoryPerSentence.cpp index 36a28089b..fc62f0679 100644 --- a/moses/TranslationModel/PhraseDictionaryMemoryPerSentence.cpp +++ b/moses/TranslationModel/PhraseDictionaryMemoryPerSentence.cpp @@ -1,6 +1,6 @@ // vim:tabstop=2 #include "PhraseDictionaryMemoryPerSentence.h" -#include "moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.h" +#include "moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerExample.h" using namespace std; diff --git a/moses/TranslationModel/PhraseDictionaryMemoryPerSentenceOnDemand.cpp b/moses/TranslationModel/PhraseDictionaryMemoryPerSentenceOnDemand.cpp index 072e482de..acf834cbd 100644 --- a/moses/TranslationModel/PhraseDictionaryMemoryPerSentenceOnDemand.cpp +++ b/moses/TranslationModel/PhraseDictionaryMemoryPerSentenceOnDemand.cpp @@ -1,6 +1,5 @@ // vim:tabstop=2 #include "PhraseDictionaryMemoryPerSentenceOnDemand.h" -#include "moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.h" #include using namespace std; diff --git a/moses/TranslationModel/PhraseDictionaryTransliteration.cpp b/moses/TranslationModel/PhraseDictionaryTransliteration.cpp index 3d1664822..2ffe880c7 100644 --- a/moses/TranslationModel/PhraseDictionaryTransliteration.cpp +++ b/moses/TranslationModel/PhraseDictionaryTransliteration.cpp @@ -2,7 +2,6 @@ #include #include "PhraseDictionaryTransliteration.h" -#include "moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.h" #include "moses/DecodeGraph.h" #include "moses/DecodeStep.h" #include "util/tempfile.hh" diff --git a/moses/TranslationModel/ProbingPT.cpp b/moses/TranslationModel/ProbingPT.cpp index c513b7808..dca7835f5 100644 --- a/moses/TranslationModel/ProbingPT.cpp +++ b/moses/TranslationModel/ProbingPT.cpp @@ -4,7 +4,6 @@ #include "moses/FactorCollection.h" #include "moses/TargetPhraseCollection.h" #include "moses/InputFileStream.h" -#include "moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.h" #include "probingpt/querying.h" #include "probingpt/probing_hash_utils.h"