From 9cfc682b1558dcd27eff701ed317f1355b62fd31 Mon Sep 17 00:00:00 2001 From: Hieu Hoang Date: Sun, 25 Oct 2015 21:20:55 +0000 Subject: [PATCH] StaticData -> System --- contrib/other-builds/moses2/Hypothesis.cpp | 2 +- contrib/other-builds/moses2/InputPaths.cpp | 6 +++--- contrib/other-builds/moses2/InputPaths.h | 4 ++-- contrib/other-builds/moses2/Jamfile | 2 +- contrib/other-builds/moses2/Main.cpp | 6 +++--- contrib/other-builds/moses2/Manager.cpp | 10 +++++----- contrib/other-builds/moses2/Manager.h | 8 ++++---- contrib/other-builds/moses2/PhraseTable.cpp | 8 ++++---- contrib/other-builds/moses2/PhraseTable.h | 4 ++-- contrib/other-builds/moses2/Scores.cpp | 10 +++++----- contrib/other-builds/moses2/Scores.h | 6 +++--- .../other-builds/moses2/{StaticData.cpp => System.cpp} | 8 ++++---- contrib/other-builds/moses2/{StaticData.h => System.h} | 8 ++++---- contrib/other-builds/moses2/TargetPhrase.cpp | 10 +++++----- contrib/other-builds/moses2/TargetPhrase.h | 6 +++--- contrib/other-builds/moses2/compile.sh | 2 +- 16 files changed, 50 insertions(+), 50 deletions(-) rename contrib/other-builds/moses2/{StaticData.cpp => System.cpp} (78%) rename contrib/other-builds/moses2/{StaticData.h => System.h} (92%) diff --git a/contrib/other-builds/moses2/Hypothesis.cpp b/contrib/other-builds/moses2/Hypothesis.cpp index adb909790..fb32cc4e1 100644 --- a/contrib/other-builds/moses2/Hypothesis.cpp +++ b/contrib/other-builds/moses2/Hypothesis.cpp @@ -7,7 +7,7 @@ #include "Hypothesis.h" #include "Manager.h" -#include "StaticData.h" +#include "System.h" Hypothesis::Hypothesis(Manager &mgr, const Moses::Bitmap &bitmap, const Moses::Range &range) :m_mgr(mgr) diff --git a/contrib/other-builds/moses2/InputPaths.cpp b/contrib/other-builds/moses2/InputPaths.cpp index 51e0ec2e4..68141c74a 100644 --- a/contrib/other-builds/moses2/InputPaths.cpp +++ b/contrib/other-builds/moses2/InputPaths.cpp @@ -7,14 +7,14 @@ #include #include "InputPaths.h" #include "Phrase.h" -#include "StaticData.h" +#include "System.h" #include "moses/Range.h" using namespace std; -void InputPaths::Init(const Phrase &input, const StaticData &staticData) +void InputPaths::Init(const Phrase &input, const System &system) { - size_t numPt = staticData.GetPhraseTables().size(); + size_t numPt = system.GetPhraseTables().size(); size_t size = input.GetSize(); for (size_t phaseSize = 1; phaseSize <= size; ++phaseSize) { for (size_t startPos = 0; startPos < size - phaseSize + 1; ++startPos) { diff --git a/contrib/other-builds/moses2/InputPaths.h b/contrib/other-builds/moses2/InputPaths.h index 4e2839710..c5fdccdb2 100644 --- a/contrib/other-builds/moses2/InputPaths.h +++ b/contrib/other-builds/moses2/InputPaths.h @@ -12,13 +12,13 @@ #include "InputPath.h" class Phrase; -class StaticData; +class System; class InputPaths { typedef std::vector Coll; public: InputPaths() {} - void Init(const Phrase &input, const StaticData &staticData); + void Init(const Phrase &input, const System &system); virtual ~InputPaths(); //! iterators diff --git a/contrib/other-builds/moses2/Jamfile b/contrib/other-builds/moses2/Jamfile index d2a06ec70..0bb35b837 100644 --- a/contrib/other-builds/moses2/Jamfile +++ b/contrib/other-builds/moses2/Jamfile @@ -19,7 +19,7 @@ import path ; Stack.cpp StatefulFeatureFunction.cpp StatelessFeatureFunction.cpp - StaticData.cpp + System.cpp TargetPhrase.cpp TargetPhrases.cpp Vocab.cpp diff --git a/contrib/other-builds/moses2/Main.cpp b/contrib/other-builds/moses2/Main.cpp index be23cd54b..f38f4dc79 100644 --- a/contrib/other-builds/moses2/Main.cpp +++ b/contrib/other-builds/moses2/Main.cpp @@ -1,5 +1,5 @@ #include -#include "StaticData.h" +#include "System.h" #include "Manager.h" #include "Phrase.h" #include "moses/InputFileStream.h" @@ -10,12 +10,12 @@ int main(int argc, char** argv) { cerr << "Starting..." << endl; - StaticData staticData; + System system; string line; while (getline(cin, line)) { - Manager mgr(staticData, line); + Manager mgr(system, line); mgr.Decode(); } diff --git a/contrib/other-builds/moses2/Manager.cpp b/contrib/other-builds/moses2/Manager.cpp index da30f2a9f..2c11d19c7 100644 --- a/contrib/other-builds/moses2/Manager.cpp +++ b/contrib/other-builds/moses2/Manager.cpp @@ -7,19 +7,19 @@ #include "Manager.h" #include "PhraseTable.h" -#include "StaticData.h" +#include "System.h" #include "SearchNormal.h" using namespace std; -Manager::Manager(const StaticData &staticData, const std::string &inputStr) -:m_staticData(staticData) +Manager::Manager(const System &system, const std::string &inputStr) +:m_staticData(system) ,m_initRange(NOT_FOUND, NOT_FOUND) { m_input = Phrase::CreateFromString(m_pool, inputStr); - m_inputPaths.Init(*m_input, staticData); + m_inputPaths.Init(*m_input, system); - const std::vector &pts = staticData.GetPhraseTables(); + const std::vector &pts = system.GetPhraseTables(); for (size_t i = 0; i < pts.size(); ++i) { const PhraseTable &pt = *pts[i]; pt.Lookups(m_inputPaths); diff --git a/contrib/other-builds/moses2/Manager.h b/contrib/other-builds/moses2/Manager.h index aea4486c2..b6cc21ed3 100644 --- a/contrib/other-builds/moses2/Manager.h +++ b/contrib/other-builds/moses2/Manager.h @@ -15,19 +15,19 @@ #include "moses/Bitmaps.h" #include "util/pool.hh" -class StaticData; +class System; class Phrase; class SearchNormal; class Manager { public: - Manager(const StaticData &staticData, const std::string &inputStr); + Manager(const System &system, const std::string &inputStr); virtual ~Manager(); util::Pool &GetPool() { return m_pool; } - const StaticData &GetStaticData() const + const System &GetStaticData() const { return m_staticData; } Moses::Bitmaps &GetBitmaps() @@ -40,7 +40,7 @@ public: protected: util::Pool m_pool; - const StaticData &m_staticData; + const System &m_staticData; Phrase *m_input; InputPaths m_inputPaths; Moses::Bitmaps *m_bitmaps; diff --git a/contrib/other-builds/moses2/PhraseTable.cpp b/contrib/other-builds/moses2/PhraseTable.cpp index 210fae211..ee464c034 100644 --- a/contrib/other-builds/moses2/PhraseTable.cpp +++ b/contrib/other-builds/moses2/PhraseTable.cpp @@ -9,7 +9,7 @@ #include "PhraseTable.h" #include "Phrase.h" #include "TargetPhrase.h" -#include "StaticData.h" +#include "System.h" #include "Scores.h" #include "InputPaths.h" #include "moses/InputFileStream.h" @@ -75,7 +75,7 @@ PhraseTable::~PhraseTable() { // TODO Auto-generated destructor stub } -void PhraseTable::Load(StaticData &staticData) +void PhraseTable::Load(System &system) { m_path = "/Users/hieu/workspace/experiment/issues/sample-models/phrase-model/phrase-table"; @@ -89,8 +89,8 @@ void PhraseTable::Load(StaticData &staticData) assert(toks.size() >= 3); Phrase *source = Phrase::CreateFromString(tmpPool, toks[0]); - TargetPhrase *target = TargetPhrase::CreateFromString(staticData.GetPool(), staticData, toks[1]); - target->GetScores().CreateFromString(toks[2], *this, staticData); + TargetPhrase *target = TargetPhrase::CreateFromString(system.GetPool(), system, toks[1]); + target->GetScores().CreateFromString(toks[2], *this, system); m_root.AddRule(*source, target); } } diff --git a/contrib/other-builds/moses2/PhraseTable.h b/contrib/other-builds/moses2/PhraseTable.h index 92082ae1f..d0267beb2 100644 --- a/contrib/other-builds/moses2/PhraseTable.h +++ b/contrib/other-builds/moses2/PhraseTable.h @@ -12,7 +12,7 @@ #include "StatelessFeatureFunction.h" #include "moses/Util.h" -class StaticData; +class System; class InputPaths; class Node @@ -38,7 +38,7 @@ class PhraseTable : public StatelessFeatureFunction public: PhraseTable(size_t startInd); virtual ~PhraseTable(); - void Load(StaticData &staticData); + void Load(System &system); void Lookups(InputPaths &inputPaths) const; void SetPtInd(size_t ind) diff --git a/contrib/other-builds/moses2/Scores.cpp b/contrib/other-builds/moses2/Scores.cpp index 74ea3ee85..7f9eb6f94 100644 --- a/contrib/other-builds/moses2/Scores.cpp +++ b/contrib/other-builds/moses2/Scores.cpp @@ -11,7 +11,7 @@ #include "FeatureFunction.h" #include "Util.h" #include "Weights.h" -#include "StaticData.h" +#include "System.h" #include "moses/Util.h" using namespace std; @@ -27,11 +27,11 @@ Scores::~Scores() { delete m_scores; } -void Scores::PlusEquals(const std::vector &scores, const FeatureFunction &featureFunction, const StaticData &staticData) +void Scores::PlusEquals(const std::vector &scores, const FeatureFunction &featureFunction, const System &system) { assert(scores.size() == featureFunction.GetNumScores()); - const Weights &weights = staticData.GetWeights(); + const Weights &weights = system.GetWeights(); size_t ffStartInd = featureFunction.GetStartInd(); for (size_t i = 0; i < scores.size(); ++i) { @@ -43,8 +43,8 @@ void Scores::PlusEquals(const std::vector &scores, const FeatureFunction } } -void Scores::CreateFromString(const std::string &str, const FeatureFunction &featureFunction, const StaticData &staticData) +void Scores::CreateFromString(const std::string &str, const FeatureFunction &featureFunction, const System &system) { vector scores = Moses::Tokenize(str); - PlusEquals(scores, featureFunction, staticData); + PlusEquals(scores, featureFunction, system); } diff --git a/contrib/other-builds/moses2/Scores.h b/contrib/other-builds/moses2/Scores.h index cbfc085be..bddf59014 100644 --- a/contrib/other-builds/moses2/Scores.h +++ b/contrib/other-builds/moses2/Scores.h @@ -11,16 +11,16 @@ #include "util/pool.hh" class FeatureFunction; -class StaticData; +class System; class Scores { public: Scores(util::Pool &pool, size_t numScores); virtual ~Scores(); - void CreateFromString(const std::string &str, const FeatureFunction &featureFunction, const StaticData &staticData); + void CreateFromString(const std::string &str, const FeatureFunction &featureFunction, const System &system); - void PlusEquals(const std::vector &scores, const FeatureFunction &featureFunction, const StaticData &staticData); + void PlusEquals(const std::vector &scores, const FeatureFunction &featureFunction, const System &system); protected: SCORE *m_scores; SCORE m_total; diff --git a/contrib/other-builds/moses2/StaticData.cpp b/contrib/other-builds/moses2/System.cpp similarity index 78% rename from contrib/other-builds/moses2/StaticData.cpp rename to contrib/other-builds/moses2/System.cpp index e171cdce3..e052a6394 100644 --- a/contrib/other-builds/moses2/StaticData.cpp +++ b/contrib/other-builds/moses2/System.cpp @@ -1,15 +1,15 @@ /* - * StaticData.cpp + * System.cpp * * Created on: 23 Oct 2015 * Author: hieu */ -#include "StaticData.h" +#include "System.h" #include "PhraseTable.h" #include "moses/Util.h" -StaticData::StaticData() +System::System() :m_ffStartInd(0) { PhraseTable *pt = new PhraseTable(m_ffStartInd); @@ -20,7 +20,7 @@ StaticData::StaticData() m_phraseTables.push_back(pt); } -StaticData::~StaticData() { +System::~System() { Moses::RemoveAllInColl(m_featureFunctions); } diff --git a/contrib/other-builds/moses2/StaticData.h b/contrib/other-builds/moses2/System.h similarity index 92% rename from contrib/other-builds/moses2/StaticData.h rename to contrib/other-builds/moses2/System.h index 0226257c0..7fa4bfc0e 100644 --- a/contrib/other-builds/moses2/StaticData.h +++ b/contrib/other-builds/moses2/System.h @@ -1,5 +1,5 @@ /* - * StaticData.h + * System.h * * Created on: 23 Oct 2015 * Author: hieu @@ -15,10 +15,10 @@ class FeatureFunction; class StatefulFeatureFunction; class PhraseTable; -class StaticData { +class System { public: - StaticData(); - virtual ~StaticData(); + System(); + virtual ~System(); size_t GetNumScores() const { return 55; } diff --git a/contrib/other-builds/moses2/TargetPhrase.cpp b/contrib/other-builds/moses2/TargetPhrase.cpp index 08399e0db..940e18137 100644 --- a/contrib/other-builds/moses2/TargetPhrase.cpp +++ b/contrib/other-builds/moses2/TargetPhrase.cpp @@ -9,25 +9,25 @@ #include "TargetPhrase.h" #include "Scores.h" #include "Manager.h" -#include "StaticData.h" +#include "System.h" #include "util/pool.hh" using namespace std; -TargetPhrase *TargetPhrase::CreateFromString(util::Pool &pool, StaticData &staticData, const std::string &str) +TargetPhrase *TargetPhrase::CreateFromString(util::Pool &pool, System &system, const std::string &str) { vector toks = Moses::Tokenize(str); size_t size = toks.size(); - TargetPhrase *ret = new (pool.Allocate()) TargetPhrase(pool, staticData, size); + TargetPhrase *ret = new (pool.Allocate()) TargetPhrase(pool, system, size); ret->Phrase::CreateFromString(toks); return ret; } -TargetPhrase::TargetPhrase(util::Pool &pool, StaticData &staticData, size_t size) +TargetPhrase::TargetPhrase(util::Pool &pool, System &system, size_t size) :Phrase(pool, size) { - m_scores = new (pool.Allocate()) Scores(pool, staticData.GetNumScores()); + m_scores = new (pool.Allocate()) Scores(pool, system.GetNumScores()); } TargetPhrase::~TargetPhrase() { diff --git a/contrib/other-builds/moses2/TargetPhrase.h b/contrib/other-builds/moses2/TargetPhrase.h index 440826bd7..dca2567f3 100644 --- a/contrib/other-builds/moses2/TargetPhrase.h +++ b/contrib/other-builds/moses2/TargetPhrase.h @@ -12,13 +12,13 @@ class Scores; class Manager; -class StaticData; +class System; class TargetPhrase : public Phrase { public: - static TargetPhrase *CreateFromString(util::Pool &pool, StaticData &staticData, const std::string &str); - TargetPhrase(util::Pool &pool, StaticData &staticData, size_t size); + static TargetPhrase *CreateFromString(util::Pool &pool, System &system, const std::string &str); + TargetPhrase(util::Pool &pool, System &system, size_t size); virtual ~TargetPhrase(); Scores &GetScores() diff --git a/contrib/other-builds/moses2/compile.sh b/contrib/other-builds/moses2/compile.sh index c2c53b62a..3a78c4a2a 100755 --- a/contrib/other-builds/moses2/compile.sh +++ b/contrib/other-builds/moses2/compile.sh @@ -13,7 +13,7 @@ g++ -I../../.. -I../../../boost/include -L../../../lib -lmoses -lz -o moses2 \ Stack.cpp \ StatefulFeatureFunction.cpp \ StatelessFeatureFunction.cpp \ - StaticData.cpp \ + System.cpp \ TargetPhrase.cpp \ TargetPhrases.cpp \ Vocab.cpp \