diff options
author | Hieu Hoang <hieuhoang@gmail.com> | 2016-09-29 13:09:32 +0300 |
---|---|---|
committer | Hieu Hoang <hieuhoang@gmail.com> | 2016-09-29 13:09:32 +0300 |
commit | 1f53032d09699d909eecaf0c2d2f608fc26b7ebb (patch) | |
tree | 999bcafc6e0a1cccc1c61d9fb856a64996634f5d | |
parent | 7572107753b7a0318f5b85675b334a47caf8a280 (diff) |
move ProbingPT from legacy -> TranslationModel
-rw-r--r-- | contrib/moses2/CreateProbingPT2.cpp | 2 | ||||
-rw-r--r-- | contrib/moses2/Jamfile | 18 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT.cpp | 4 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/StoreTarget.cpp (renamed from contrib/moses2/legacy/ProbingPT/StoreTarget.cpp) | 4 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/StoreTarget.h (renamed from contrib/moses2/legacy/ProbingPT/StoreTarget.h) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/StoreVocab.cpp (renamed from contrib/moses2/legacy/ProbingPT/StoreVocab.cpp) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/StoreVocab.h (renamed from contrib/moses2/legacy/ProbingPT/StoreVocab.h) | 4 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/hash.cpp (renamed from contrib/moses2/legacy/ProbingPT/hash.cpp) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/hash.hh (renamed from contrib/moses2/legacy/ProbingPT/hash.hh) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/line_splitter.cpp (renamed from contrib/moses2/legacy/ProbingPT/line_splitter.cpp) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/line_splitter.hh (renamed from contrib/moses2/legacy/ProbingPT/line_splitter.hh) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/probing_hash_utils.cpp (renamed from contrib/moses2/legacy/ProbingPT/probing_hash_utils.cpp) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/probing_hash_utils.hh (renamed from contrib/moses2/legacy/ProbingPT/probing_hash_utils.hh) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/quering.cpp (renamed from contrib/moses2/legacy/ProbingPT/quering.cpp) | 2 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/quering.hh (renamed from contrib/moses2/legacy/ProbingPT/quering.hh) | 2 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/storing.cpp (renamed from contrib/moses2/legacy/ProbingPT/storing.cpp) | 4 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/storing.hh (renamed from contrib/moses2/legacy/ProbingPT/storing.hh) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/vocabid.cpp (renamed from contrib/moses2/legacy/ProbingPT/vocabid.cpp) | 2 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/ProbingPT/vocabid.hh (renamed from contrib/moses2/legacy/ProbingPT/vocabid.hh) | 0 |
19 files changed, 21 insertions, 21 deletions
diff --git a/contrib/moses2/CreateProbingPT2.cpp b/contrib/moses2/CreateProbingPT2.cpp index ed7af3bd9..24b0e2fd1 100644 --- a/contrib/moses2/CreateProbingPT2.cpp +++ b/contrib/moses2/CreateProbingPT2.cpp @@ -1,7 +1,7 @@ #include <string> #include <boost/program_options.hpp> #include "util/usage.hh" -#include "legacy/ProbingPT/storing.hh" +#include "TranslationModel/ProbingPT/storing.hh" #include "legacy/InputFileStream.h" #include "legacy/OutputFileStream.h" #include "legacy/Util2.h" diff --git a/contrib/moses2/Jamfile b/contrib/moses2/Jamfile index c025d02cf..f793d3b3f 100644 --- a/contrib/moses2/Jamfile +++ b/contrib/moses2/Jamfile @@ -67,6 +67,15 @@ alias deps : ../..//z ../..//boost_iostreams ../..//boost_filesystem ../../mose TranslationModel/CompactPT/MurmurHash3.cpp TranslationModel/CompactPT/ThrowingFwrite.cpp + TranslationModel/ProbingPT/hash.cpp + TranslationModel/ProbingPT/line_splitter.cpp + TranslationModel/ProbingPT/probing_hash_utils.cpp + TranslationModel/ProbingPT/quering.cpp + TranslationModel/ProbingPT/storing.cpp + TranslationModel/ProbingPT/StoreVocab.cpp + TranslationModel/ProbingPT/StoreTarget.cpp + TranslationModel/ProbingPT/vocabid.cpp + parameters/AllOptions.cpp parameters/BookkeepingOptions.cpp parameters/ContextParameters.cpp @@ -137,15 +146,6 @@ alias deps : ../..//z ../..//boost_iostreams ../..//boost_filesystem ../../mose legacy/Timer.cpp legacy/Util2.cpp - legacy/ProbingPT/hash.cpp - legacy/ProbingPT/line_splitter.cpp - legacy/ProbingPT/probing_hash_utils.cpp - legacy/ProbingPT/quering.cpp - legacy/ProbingPT/storing.cpp - legacy/ProbingPT/StoreVocab.cpp - legacy/ProbingPT/StoreTarget.cpp - legacy/ProbingPT/vocabid.cpp - SCFG/ActiveChart.cpp SCFG/Hypothesis.cpp SCFG/InputPath.cpp diff --git a/contrib/moses2/TranslationModel/ProbingPT.cpp b/contrib/moses2/TranslationModel/ProbingPT.cpp index de95e0e6e..0567e1ac1 100644 --- a/contrib/moses2/TranslationModel/ProbingPT.cpp +++ b/contrib/moses2/TranslationModel/ProbingPT.cpp @@ -12,9 +12,9 @@ #include "../Phrase.h" #include "../legacy/InputFileStream.h" #include "../legacy/FactorCollection.h" -#include "../legacy/ProbingPT/quering.hh" #include "../legacy/Util2.h" -#include "../legacy/ProbingPT/probing_hash_utils.hh" +#include "ProbingPT/quering.hh" +#include "ProbingPT/probing_hash_utils.hh" #include "../FF/FeatureFunctions.h" #include "../PhraseBased/PhraseImpl.h" #include "../PhraseBased/TargetPhraseImpl.h" diff --git a/contrib/moses2/legacy/ProbingPT/StoreTarget.cpp b/contrib/moses2/TranslationModel/ProbingPT/StoreTarget.cpp index d53b51d8a..326aaea5f 100644 --- a/contrib/moses2/legacy/ProbingPT/StoreTarget.cpp +++ b/contrib/moses2/TranslationModel/ProbingPT/StoreTarget.cpp @@ -8,8 +8,8 @@ #include "StoreTarget.h" #include "line_splitter.hh" #include "probing_hash_utils.hh" -#include "../OutputFileStream.h" -#include "../Util2.h" +#include "../../legacy/OutputFileStream.h" +#include "../../legacy/Util2.h" using namespace std; diff --git a/contrib/moses2/legacy/ProbingPT/StoreTarget.h b/contrib/moses2/TranslationModel/ProbingPT/StoreTarget.h index 6fc3b1f66..6fc3b1f66 100644 --- a/contrib/moses2/legacy/ProbingPT/StoreTarget.h +++ b/contrib/moses2/TranslationModel/ProbingPT/StoreTarget.h diff --git a/contrib/moses2/legacy/ProbingPT/StoreVocab.cpp b/contrib/moses2/TranslationModel/ProbingPT/StoreVocab.cpp index e0b5b0b08..e0b5b0b08 100644 --- a/contrib/moses2/legacy/ProbingPT/StoreVocab.cpp +++ b/contrib/moses2/TranslationModel/ProbingPT/StoreVocab.cpp diff --git a/contrib/moses2/legacy/ProbingPT/StoreVocab.h b/contrib/moses2/TranslationModel/ProbingPT/StoreVocab.h index 1fba50674..e9808707a 100644 --- a/contrib/moses2/legacy/ProbingPT/StoreVocab.h +++ b/contrib/moses2/TranslationModel/ProbingPT/StoreVocab.h @@ -7,8 +7,8 @@ #pragma once #include <string> #include <boost/unordered_map.hpp> -#include "../OutputFileStream.h" -#include "../Util2.h" +#include "../../legacy/OutputFileStream.h" +#include "../../legacy/Util2.h" namespace Moses2 { diff --git a/contrib/moses2/legacy/ProbingPT/hash.cpp b/contrib/moses2/TranslationModel/ProbingPT/hash.cpp index aab5ee2b3..aab5ee2b3 100644 --- a/contrib/moses2/legacy/ProbingPT/hash.cpp +++ b/contrib/moses2/TranslationModel/ProbingPT/hash.cpp diff --git a/contrib/moses2/legacy/ProbingPT/hash.hh b/contrib/moses2/TranslationModel/ProbingPT/hash.hh index 78cc27999..78cc27999 100644 --- a/contrib/moses2/legacy/ProbingPT/hash.hh +++ b/contrib/moses2/TranslationModel/ProbingPT/hash.hh diff --git a/contrib/moses2/legacy/ProbingPT/line_splitter.cpp b/contrib/moses2/TranslationModel/ProbingPT/line_splitter.cpp index e4b5e2694..e4b5e2694 100644 --- a/contrib/moses2/legacy/ProbingPT/line_splitter.cpp +++ b/contrib/moses2/TranslationModel/ProbingPT/line_splitter.cpp diff --git a/contrib/moses2/legacy/ProbingPT/line_splitter.hh b/contrib/moses2/TranslationModel/ProbingPT/line_splitter.hh index 3b086b44a..3b086b44a 100644 --- a/contrib/moses2/legacy/ProbingPT/line_splitter.hh +++ b/contrib/moses2/TranslationModel/ProbingPT/line_splitter.hh diff --git a/contrib/moses2/legacy/ProbingPT/probing_hash_utils.cpp b/contrib/moses2/TranslationModel/ProbingPT/probing_hash_utils.cpp index c72709d3c..c72709d3c 100644 --- a/contrib/moses2/legacy/ProbingPT/probing_hash_utils.cpp +++ b/contrib/moses2/TranslationModel/ProbingPT/probing_hash_utils.cpp diff --git a/contrib/moses2/legacy/ProbingPT/probing_hash_utils.hh b/contrib/moses2/TranslationModel/ProbingPT/probing_hash_utils.hh index 841934027..841934027 100644 --- a/contrib/moses2/legacy/ProbingPT/probing_hash_utils.hh +++ b/contrib/moses2/TranslationModel/ProbingPT/probing_hash_utils.hh diff --git a/contrib/moses2/legacy/ProbingPT/quering.cpp b/contrib/moses2/TranslationModel/ProbingPT/quering.cpp index a4aa37792..f26439442 100644 --- a/contrib/moses2/legacy/ProbingPT/quering.cpp +++ b/contrib/moses2/TranslationModel/ProbingPT/quering.cpp @@ -1,6 +1,6 @@ #include "quering.hh" #include "util/exception.hh" -#include "../Util2.h" +#include "../../legacy/Util2.h" using namespace std; diff --git a/contrib/moses2/legacy/ProbingPT/quering.hh b/contrib/moses2/TranslationModel/ProbingPT/quering.hh index 1dd9bc1af..aae4b4f09 100644 --- a/contrib/moses2/legacy/ProbingPT/quering.hh +++ b/contrib/moses2/TranslationModel/ProbingPT/quering.hh @@ -8,7 +8,7 @@ #include "probing_hash_utils.hh" #include "hash.hh" //Includes line splitter #include "line_splitter.hh" -#include "../Util2.h" +#include "../../legacy/Util2.h" namespace Moses2 { diff --git a/contrib/moses2/legacy/ProbingPT/storing.cpp b/contrib/moses2/TranslationModel/ProbingPT/storing.cpp index c531a3012..75cdcc038 100644 --- a/contrib/moses2/legacy/ProbingPT/storing.cpp +++ b/contrib/moses2/TranslationModel/ProbingPT/storing.cpp @@ -4,8 +4,8 @@ #include "storing.hh" #include "StoreTarget.h" #include "StoreVocab.h" -#include "../Util2.h" -#include "../InputFileStream.h" +#include "../../legacy/Util2.h" +#include "../../legacy/InputFileStream.h" using namespace std; diff --git a/contrib/moses2/legacy/ProbingPT/storing.hh b/contrib/moses2/TranslationModel/ProbingPT/storing.hh index 10d7050d3..10d7050d3 100644 --- a/contrib/moses2/legacy/ProbingPT/storing.hh +++ b/contrib/moses2/TranslationModel/ProbingPT/storing.hh diff --git a/contrib/moses2/legacy/ProbingPT/vocabid.cpp b/contrib/moses2/TranslationModel/ProbingPT/vocabid.cpp index 3c007262c..696373ee5 100644 --- a/contrib/moses2/legacy/ProbingPT/vocabid.cpp +++ b/contrib/moses2/TranslationModel/ProbingPT/vocabid.cpp @@ -1,7 +1,7 @@ #include <boost/foreach.hpp> #include "vocabid.hh" #include "StoreVocab.h" -#include "../Util2.h" +#include "../../legacy/Util2.h" namespace Moses2 { diff --git a/contrib/moses2/legacy/ProbingPT/vocabid.hh b/contrib/moses2/TranslationModel/ProbingPT/vocabid.hh index 55d99d453..55d99d453 100644 --- a/contrib/moses2/legacy/ProbingPT/vocabid.hh +++ b/contrib/moses2/TranslationModel/ProbingPT/vocabid.hh |