From 59449f292508310d8576b9f4c9a602a8679221b6 Mon Sep 17 00:00:00 2001 From: Hieu Hoang Date: Tue, 27 Nov 2012 15:08:31 +0000 Subject: [PATCH] make TranslationModel subdirectory and move files from moses/ into it --- OnDiskPt/TargetPhrase.cpp | 2 +- OnDiskPt/TargetPhraseCollection.cpp | 2 +- contrib/other-builds/moses/.project | 65 ++----------------- contrib/server/mosesserver.cpp | 2 +- moses-chart-cmd/IOWrapper.cpp | 2 +- .../CompactPT/LexicalReorderingTableCompact.h | 2 +- moses/CompactPT/PhraseDictionaryCompact.h | 2 +- moses/ConfusionNet.cpp | 2 +- moses/DecodeStep.cpp | 2 +- moses/DecodeStepTranslation.cpp | 2 +- moses/DecodeStepTranslation.h | 2 +- moses/Hypothesis.h | 2 +- moses/Jamfile | 1 + moses/LexicalReorderingTable.cpp | 2 +- moses/Makefile.am | 12 ++-- moses/PDTAimp.h | 4 +- moses/RuleTable/PhraseDictionaryFuzzyMatch.h | 2 +- moses/RuleTable/PhraseDictionaryNodeSCFG.cpp | 2 +- moses/RuleTable/PhraseDictionaryOnDisk.h | 2 +- moses/RuleTable/PhraseDictionarySCFG.h | 2 +- moses/RuleTable/Trie.h | 2 +- moses/Sentence.cpp | 2 +- moses/StaticData.cpp | 4 +- moses/TargetPhrase.cpp | 2 +- .../PhraseDictionary.cpp | 26 ++++---- .../{ => TranslationModel}/PhraseDictionary.h | 10 +-- .../PhraseDictionaryDynSuffixArray.cpp | 8 +-- .../PhraseDictionaryDynSuffixArray.h | 4 +- .../PhraseDictionaryMemory.cpp | 18 ++--- .../PhraseDictionaryMemory.h | 4 +- .../PhraseDictionaryNode.cpp | 6 +- .../PhraseDictionaryNode.h | 4 +- .../PhraseDictionaryTree.cpp | 4 +- .../PhraseDictionaryTree.h | 18 ++--- .../PhraseDictionaryTreeAdaptor.cpp | 24 +++---- .../PhraseDictionaryTreeAdaptor.h | 6 +- moses/TranslationOption.cpp | 2 +- moses/TranslationOptionCollection.cpp | 2 +- ...ranslationOptionCollectionConfusionNet.cpp | 2 +- moses/TranslationOptionCollectionText.cpp | 2 +- 40 files changed, 105 insertions(+), 159 deletions(-) rename moses/{ => TranslationModel}/PhraseDictionary.cpp (94%) rename moses/{ => TranslationModel}/PhraseDictionary.h (97%) rename moses/{ => TranslationModel}/PhraseDictionaryDynSuffixArray.cpp (94%) rename moses/{ => TranslationModel}/PhraseDictionaryDynSuffixArray.h (93%) rename moses/{ => TranslationModel}/PhraseDictionaryMemory.cpp (96%) rename moses/{ => TranslationModel}/PhraseDictionaryMemory.h (95%) rename moses/{ => TranslationModel}/PhraseDictionaryNode.cpp (92%) rename moses/{ => TranslationModel}/PhraseDictionaryNode.h (97%) rename moses/{ => TranslationModel}/PhraseDictionaryTree.cpp (99%) rename moses/{ => TranslationModel}/PhraseDictionaryTree.h (93%) rename moses/{ => TranslationModel}/PhraseDictionaryTreeAdaptor.cpp (87%) rename moses/{ => TranslationModel}/PhraseDictionaryTreeAdaptor.h (94%) diff --git a/OnDiskPt/TargetPhrase.cpp b/OnDiskPt/TargetPhrase.cpp index 2bc3a9b45..88e738455 100644 --- a/OnDiskPt/TargetPhrase.cpp +++ b/OnDiskPt/TargetPhrase.cpp @@ -22,7 +22,7 @@ #include #include "moses/Util.h" #include "moses/TargetPhrase.h" -#include "moses/PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionary.h" #include "moses/DummyScoreProducers.h" #include "TargetPhrase.h" #include "OnDiskWrapper.h" diff --git a/OnDiskPt/TargetPhraseCollection.cpp b/OnDiskPt/TargetPhraseCollection.cpp index 5f1fdda99..a63865bc6 100644 --- a/OnDiskPt/TargetPhraseCollection.cpp +++ b/OnDiskPt/TargetPhraseCollection.cpp @@ -22,7 +22,7 @@ #include #include "moses/Util.h" #include "moses/TargetPhraseCollection.h" -#include "moses/PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionary.h" #include "TargetPhraseCollection.h" #include "Vocab.h" #include "OnDiskWrapper.h" diff --git a/contrib/other-builds/moses/.project b/contrib/other-builds/moses/.project index 66e92a162..9fec39edf 100644 --- a/contrib/other-builds/moses/.project +++ b/contrib/other-builds/moses/.project @@ -746,66 +746,6 @@ 1 PARENT-3-PROJECT_LOC/moses/PhraseBoundaryFeature.h - - PhraseDictionary.cpp - 1 - PARENT-3-PROJECT_LOC/moses/PhraseDictionary.cpp - - - PhraseDictionary.h - 1 - PARENT-3-PROJECT_LOC/moses/PhraseDictionary.h - - - PhraseDictionaryDynSuffixArray.cpp - 1 - PARENT-3-PROJECT_LOC/moses/PhraseDictionaryDynSuffixArray.cpp - - - PhraseDictionaryDynSuffixArray.h - 1 - PARENT-3-PROJECT_LOC/moses/PhraseDictionaryDynSuffixArray.h - - - PhraseDictionaryMemory.cpp - 1 - PARENT-3-PROJECT_LOC/moses/PhraseDictionaryMemory.cpp - - - PhraseDictionaryMemory.h - 1 - PARENT-3-PROJECT_LOC/moses/PhraseDictionaryMemory.h - - - PhraseDictionaryNode.cpp - 1 - PARENT-3-PROJECT_LOC/moses/PhraseDictionaryNode.cpp - - - PhraseDictionaryNode.h - 1 - PARENT-3-PROJECT_LOC/moses/PhraseDictionaryNode.h - - - PhraseDictionaryTree.cpp - 1 - PARENT-3-PROJECT_LOC/moses/PhraseDictionaryTree.cpp - - - PhraseDictionaryTree.h - 1 - PARENT-3-PROJECT_LOC/moses/PhraseDictionaryTree.h - - - PhraseDictionaryTreeAdaptor.cpp - 1 - PARENT-3-PROJECT_LOC/moses/PhraseDictionaryTreeAdaptor.cpp - - - PhraseDictionaryTreeAdaptor.h - 1 - PARENT-3-PROJECT_LOC/moses/PhraseDictionaryTreeAdaptor.h - PhraseLengthFeature.cpp 1 @@ -1131,6 +1071,11 @@ 1 PARENT-3-PROJECT_LOC/moses/Timer.h + + TranslationModel + 2 + PARENT-3-PROJECT_LOC/moses/TranslationModel + TranslationOption.cpp 1 diff --git a/contrib/server/mosesserver.cpp b/contrib/server/mosesserver.cpp index 0ab6905fc..98024c891 100644 --- a/contrib/server/mosesserver.cpp +++ b/contrib/server/mosesserver.cpp @@ -7,7 +7,7 @@ #include "moses/Hypothesis.h" #include "moses/Manager.h" #include "moses/StaticData.h" -#include "moses/PhraseDictionaryDynSuffixArray.h" +#include "moses/TranslationModel/PhraseDictionaryDynSuffixArray.h" #include "moses/TranslationSystem.h" #include "moses/TreeInput.h" #include "moses/LMList.h" diff --git a/moses-chart-cmd/IOWrapper.cpp b/moses-chart-cmd/IOWrapper.cpp index 94c24229b..3f2a19de9 100644 --- a/moses-chart-cmd/IOWrapper.cpp +++ b/moses-chart-cmd/IOWrapper.cpp @@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE. #include "moses/DummyScoreProducers.h" #include "moses/InputFileStream.h" #include "moses/Incremental.h" -#include "moses/PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionary.h" #include "moses/ChartTrellisPathList.h" #include "moses/ChartTrellisPath.h" #include "moses/ChartTrellisNode.h" diff --git a/moses/CompactPT/LexicalReorderingTableCompact.h b/moses/CompactPT/LexicalReorderingTableCompact.h index fd1cfadae..849c61c08 100644 --- a/moses/CompactPT/LexicalReorderingTableCompact.h +++ b/moses/CompactPT/LexicalReorderingTableCompact.h @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "moses/LexicalReorderingTable.h" #include "moses/StaticData.h" -#include "moses/PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionary.h" #include "moses/GenerationDictionary.h" #include "moses/TargetPhrase.h" #include "moses/TargetPhraseCollection.h" diff --git a/moses/CompactPT/PhraseDictionaryCompact.h b/moses/CompactPT/PhraseDictionaryCompact.h index 0b59e43d1..6386932ac 100644 --- a/moses/CompactPT/PhraseDictionaryCompact.h +++ b/moses/CompactPT/PhraseDictionaryCompact.h @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #endif #endif -#include "moses/PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionary.h" #include "moses/ThreadPool.h" #include "BlockHashIndex.h" diff --git a/moses/ConfusionNet.cpp b/moses/ConfusionNet.cpp index 8ff119497..c8d3dd3bf 100644 --- a/moses/ConfusionNet.cpp +++ b/moses/ConfusionNet.cpp @@ -5,7 +5,7 @@ #include "FactorCollection.h" #include "Util.h" -#include "PhraseDictionaryTreeAdaptor.h" +#include "moses/TranslationModel/PhraseDictionaryTreeAdaptor.h" #include "TranslationOptionCollectionConfusionNet.h" #include "StaticData.h" #include "Sentence.h" diff --git a/moses/DecodeStep.cpp b/moses/DecodeStep.cpp index 3345f95d0..a4ab70d3e 100644 --- a/moses/DecodeStep.cpp +++ b/moses/DecodeStep.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ***********************************************************************/ #include "DecodeStep.h" -#include "PhraseDictionaryMemory.h" +#include "moses/TranslationModel/PhraseDictionaryMemory.h" #include "GenerationDictionary.h" #include "StaticData.h" diff --git a/moses/DecodeStepTranslation.cpp b/moses/DecodeStepTranslation.cpp index 03713b50c..4ddc43ddc 100644 --- a/moses/DecodeStepTranslation.cpp +++ b/moses/DecodeStepTranslation.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ***********************************************************************/ #include "DecodeStepTranslation.h" -#include "PhraseDictionaryMemory.h" +#include "moses/TranslationModel/PhraseDictionaryMemory.h" #include "TranslationOption.h" #include "TranslationOptionCollection.h" #include "PartialTranslOptColl.h" diff --git a/moses/DecodeStepTranslation.h b/moses/DecodeStepTranslation.h index 651754b1c..a98075587 100644 --- a/moses/DecodeStepTranslation.h +++ b/moses/DecodeStepTranslation.h @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #define moses_DecodeStepTranslation_h #include "DecodeStep.h" -#include "PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionary.h" namespace Moses { diff --git a/moses/Hypothesis.h b/moses/Hypothesis.h index fe885ccc8..f08ee121e 100644 --- a/moses/Hypothesis.h +++ b/moses/Hypothesis.h @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "WordsBitmap.h" #include "Sentence.h" #include "Phrase.h" -#include "PhraseDictionaryMemory.h" +#include "moses/TranslationModel/PhraseDictionaryMemory.h" #include "GenerationDictionary.h" #include "ScoreComponentCollection.h" #include "InputType.h" diff --git a/moses/Jamfile b/moses/Jamfile index 9caa4e788..5f4b7589c 100644 --- a/moses/Jamfile +++ b/moses/Jamfile @@ -32,6 +32,7 @@ lib moses : CYKPlusParser/*.cpp RuleTable/*.cpp fuzzy-match/*.cpp + TranslationModel/*.cpp : #exceptions ThreadPool.cpp SyntacticLanguageModel.cpp diff --git a/moses/LexicalReorderingTable.cpp b/moses/LexicalReorderingTable.cpp index 05be8c366..486bdb2c3 100644 --- a/moses/LexicalReorderingTable.cpp +++ b/moses/LexicalReorderingTable.cpp @@ -3,7 +3,7 @@ //#include "LVoc.h" //need IPhrase #include "StaticData.h" -#include "PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionary.h" #include "GenerationDictionary.h" #include "TargetPhrase.h" #include "TargetPhraseCollection.h" diff --git a/moses/Makefile.am b/moses/Makefile.am index b43191773..1644a20db 100644 --- a/moses/Makefile.am +++ b/moses/Makefile.am @@ -83,16 +83,16 @@ libmoses_la_HEADERS = \ PartialTranslOptColl.h \ Phrase.h \ PhraseBoundaryFeature.h \ - PhraseDictionary.h \ + moses/TranslationModel/PhraseDictionary.h \ PhraseDictionaryALSuffixArray.h \ - PhraseDictionaryDynSuffixArray.h \ - PhraseDictionaryMemory.h \ + moses/TranslationModel/PhraseDictionaryDynSuffixArray.h \ + moses/TranslationModel/PhraseDictionaryMemory.h \ PhraseDictionarySCFG.h \ - PhraseDictionaryNode.h \ + moses/TranslationModel/PhraseDictionaryNode.h \ PhraseDictionaryNodeSCFG.h \ PhraseDictionaryOnDisk.h \ - PhraseDictionaryTree.h \ - PhraseDictionaryTreeAdaptor.h \ + moses/TranslationModel/PhraseDictionaryTree.h \ + moses/TranslationModel/PhraseDictionaryTreeAdaptor.h \ PhraseLengthFeature.h \ PhrasePairFeature.h \ PrefixTree.h \ diff --git a/moses/PDTAimp.h b/moses/PDTAimp.h index 87f2e1aeb..25131b98a 100644 --- a/moses/PDTAimp.h +++ b/moses/PDTAimp.h @@ -5,10 +5,10 @@ #define moses_PDTAimp_h #include "StaticData.h" // needed for factor splitter -#include "PhraseDictionaryTree.h" +#include "moses/TranslationModel/PhraseDictionaryTree.h" #include "UniqueObject.h" #include "InputFileStream.h" -#include "PhraseDictionaryTreeAdaptor.h" +#include "moses/TranslationModel/PhraseDictionaryTreeAdaptor.h" #include "SparsePhraseDictionaryFeature.h" #include "Util.h" diff --git a/moses/RuleTable/PhraseDictionaryFuzzyMatch.h b/moses/RuleTable/PhraseDictionaryFuzzyMatch.h index 777ef6abb..24061dae1 100644 --- a/moses/RuleTable/PhraseDictionaryFuzzyMatch.h +++ b/moses/RuleTable/PhraseDictionaryFuzzyMatch.h @@ -19,7 +19,7 @@ #pragma once -#include "moses/PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionary.h" #include "moses/InputType.h" #include "moses/NonTerminal.h" #include "moses/fuzzy-match/FuzzyMatchWrapper.h" diff --git a/moses/RuleTable/PhraseDictionaryNodeSCFG.cpp b/moses/RuleTable/PhraseDictionaryNodeSCFG.cpp index a502bab40..466efd5c6 100644 --- a/moses/RuleTable/PhraseDictionaryNodeSCFG.cpp +++ b/moses/RuleTable/PhraseDictionaryNodeSCFG.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "PhraseDictionaryNodeSCFG.h" #include "moses/TargetPhrase.h" -#include "moses/PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionary.h" namespace Moses { diff --git a/moses/RuleTable/PhraseDictionaryOnDisk.h b/moses/RuleTable/PhraseDictionaryOnDisk.h index 38a057d11..60dd71bb1 100644 --- a/moses/RuleTable/PhraseDictionaryOnDisk.h +++ b/moses/RuleTable/PhraseDictionaryOnDisk.h @@ -24,7 +24,7 @@ #include #include #include -#include "moses/PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionary.h" #include "OnDiskPt/OnDiskWrapper.h" #include "OnDiskPt/Word.h" #include "OnDiskPt/PhraseNode.h" diff --git a/moses/RuleTable/PhraseDictionarySCFG.h b/moses/RuleTable/PhraseDictionarySCFG.h index b487754c9..ece7be910 100644 --- a/moses/RuleTable/PhraseDictionarySCFG.h +++ b/moses/RuleTable/PhraseDictionarySCFG.h @@ -19,7 +19,7 @@ #pragma once -#include "moses/PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionary.h" #include "moses/InputType.h" #include "moses/NonTerminal.h" #include "PhraseDictionaryNodeSCFG.h" diff --git a/moses/RuleTable/Trie.h b/moses/RuleTable/Trie.h index 1971544a1..0d8f0a735 100644 --- a/moses/RuleTable/Trie.h +++ b/moses/RuleTable/Trie.h @@ -19,7 +19,7 @@ #pragma once -#include "moses/PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionary.h" #include "moses/TypeDef.h" #include diff --git a/moses/Sentence.cpp b/moses/Sentence.cpp index b840281db..8acabd955 100644 --- a/moses/Sentence.cpp +++ b/moses/Sentence.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include #include "Sentence.h" -#include "PhraseDictionaryMemory.h" +#include "moses/TranslationModel/PhraseDictionaryMemory.h" #include "TranslationOptionCollectionText.h" #include "StaticData.h" #include "Util.h" diff --git a/moses/StaticData.cpp b/moses/StaticData.cpp index b2004d4c0..6190541b5 100644 --- a/moses/StaticData.cpp +++ b/moses/StaticData.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include #include "util/check.hh" -#include "PhraseDictionaryMemory.h" +#include "moses/TranslationModel/PhraseDictionaryMemory.h" #include "DecodeStepTranslation.h" #include "DecodeStepGeneration.h" #include "GenerationDictionary.h" @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "GlobalLexicalModelUnlimited.h" #include "SentenceStats.h" #include "PhraseBoundaryFeature.h" -#include "PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionary.h" #include "SparsePhraseDictionaryFeature.h" #include "PhrasePairFeature.h" #include "PhraseLengthFeature.h" diff --git a/moses/TargetPhrase.cpp b/moses/TargetPhrase.cpp index fb9df2cbf..b1d99ab50 100644 --- a/moses/TargetPhrase.cpp +++ b/moses/TargetPhrase.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "util/tokenize_piece.hh" #include "TargetPhrase.h" -#include "PhraseDictionaryMemory.h" +#include "moses/TranslationModel/PhraseDictionaryMemory.h" #include "GenerationDictionary.h" #include "LM/Base.h" #include "StaticData.h" diff --git a/moses/PhraseDictionary.cpp b/moses/TranslationModel/PhraseDictionary.cpp similarity index 94% rename from moses/PhraseDictionary.cpp rename to moses/TranslationModel/PhraseDictionary.cpp index 546a0c9c0..2ad545e82 100644 --- a/moses/PhraseDictionary.cpp +++ b/moses/TranslationModel/PhraseDictionary.cpp @@ -19,23 +19,23 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ***********************************************************************/ -#include "PhraseDictionary.h" -#include "PhraseDictionaryTreeAdaptor.h" -#include "RuleTable/PhraseDictionarySCFG.h" -#include "RuleTable/PhraseDictionaryOnDisk.h" -#include "RuleTable/PhraseDictionaryALSuffixArray.h" -#include "RuleTable/PhraseDictionaryFuzzyMatch.h" +#include "moses/TranslationModel/PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionaryTreeAdaptor.h" +#include "moses/RuleTable/PhraseDictionarySCFG.h" +#include "moses/RuleTable/PhraseDictionaryOnDisk.h" +#include "moses/RuleTable/PhraseDictionaryALSuffixArray.h" +#include "moses/RuleTable/PhraseDictionaryFuzzyMatch.h" #ifndef WIN32 -#include "PhraseDictionaryDynSuffixArray.h" -#include "CompactPT/PhraseDictionaryCompact.h" +#include "moses/TranslationModel/PhraseDictionaryDynSuffixArray.h" +#include "moses/CompactPT/PhraseDictionaryCompact.h" #endif -#include "RuleTable/UTrie.h" +#include "moses/RuleTable/UTrie.h" -#include "StaticData.h" -#include "InputType.h" -#include "TranslationOption.h" -#include "UserMessage.h" +#include "moses/StaticData.h" +#include "moses/InputType.h" +#include "moses/TranslationOption.h" +#include "moses/UserMessage.h" using namespace std; diff --git a/moses/PhraseDictionary.h b/moses/TranslationModel/PhraseDictionary.h similarity index 97% rename from moses/PhraseDictionary.h rename to moses/TranslationModel/PhraseDictionary.h index ec635c179..282ce5480 100644 --- a/moses/PhraseDictionary.h +++ b/moses/TranslationModel/PhraseDictionary.h @@ -34,11 +34,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include #endif -#include "Phrase.h" -#include "TargetPhrase.h" -#include "Dictionary.h" -#include "TargetPhraseCollection.h" -#include "DecodeFeature.h" +#include "moses/Phrase.h" +#include "moses/TargetPhrase.h" +#include "moses/Dictionary.h" +#include "moses/TargetPhraseCollection.h" +#include "moses/DecodeFeature.h" namespace Moses { diff --git a/moses/PhraseDictionaryDynSuffixArray.cpp b/moses/TranslationModel/PhraseDictionaryDynSuffixArray.cpp similarity index 94% rename from moses/PhraseDictionaryDynSuffixArray.cpp rename to moses/TranslationModel/PhraseDictionaryDynSuffixArray.cpp index c54d439de..82f7b1936 100644 --- a/moses/PhraseDictionaryDynSuffixArray.cpp +++ b/moses/TranslationModel/PhraseDictionaryDynSuffixArray.cpp @@ -1,7 +1,7 @@ -#include "PhraseDictionaryDynSuffixArray.h" -#include "FactorCollection.h" -#include "StaticData.h" -#include "TargetPhrase.h" +#include "moses/TranslationModel/PhraseDictionaryDynSuffixArray.h" +#include "moses/FactorCollection.h" +#include "moses/StaticData.h" +#include "moses/TargetPhrase.h" #include using namespace std; diff --git a/moses/PhraseDictionaryDynSuffixArray.h b/moses/TranslationModel/PhraseDictionaryDynSuffixArray.h similarity index 93% rename from moses/PhraseDictionaryDynSuffixArray.h rename to moses/TranslationModel/PhraseDictionaryDynSuffixArray.h index dab84ed2a..ebad9ad61 100644 --- a/moses/PhraseDictionaryDynSuffixArray.h +++ b/moses/TranslationModel/PhraseDictionaryDynSuffixArray.h @@ -3,8 +3,8 @@ #include -#include "PhraseDictionary.h" -#include "BilingualDynSuffixArray.h" +#include "moses/TranslationModel/PhraseDictionary.h" +#include "moses/BilingualDynSuffixArray.h" namespace Moses { diff --git a/moses/PhraseDictionaryMemory.cpp b/moses/TranslationModel/PhraseDictionaryMemory.cpp similarity index 96% rename from moses/PhraseDictionaryMemory.cpp rename to moses/TranslationModel/PhraseDictionaryMemory.cpp index 0c608422f..ab27e79a7 100644 --- a/moses/PhraseDictionaryMemory.cpp +++ b/moses/TranslationModel/PhraseDictionaryMemory.cpp @@ -30,15 +30,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "util/file_piece.hh" #include "util/tokenize_piece.hh" -#include "PhraseDictionaryMemory.h" -#include "FactorCollection.h" -#include "Word.h" -#include "Util.h" -#include "InputFileStream.h" -#include "StaticData.h" -#include "WordsRange.h" -#include "UserMessage.h" -#include "SparsePhraseDictionaryFeature.h" +#include "moses/TranslationModel/PhraseDictionaryMemory.h" +#include "moses/FactorCollection.h" +#include "moses/Word.h" +#include "moses/Util.h" +#include "moses/InputFileStream.h" +#include "moses/StaticData.h" +#include "moses/WordsRange.h" +#include "moses/UserMessage.h" +#include "moses/SparsePhraseDictionaryFeature.h" using namespace std; diff --git a/moses/PhraseDictionaryMemory.h b/moses/TranslationModel/PhraseDictionaryMemory.h similarity index 95% rename from moses/PhraseDictionaryMemory.h rename to moses/TranslationModel/PhraseDictionaryMemory.h index 5c5c2158b..c1290fc11 100644 --- a/moses/PhraseDictionaryMemory.h +++ b/moses/TranslationModel/PhraseDictionaryMemory.h @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #ifndef moses_PhraseDictionaryMemory_h #define moses_PhraseDictionaryMemory_h -#include "PhraseDictionary.h" -#include "PhraseDictionaryNode.h" +#include "moses/TranslationModel/PhraseDictionary.h" +#include "moses/TranslationModel/PhraseDictionaryNode.h" namespace Moses { diff --git a/moses/PhraseDictionaryNode.cpp b/moses/TranslationModel/PhraseDictionaryNode.cpp similarity index 92% rename from moses/PhraseDictionaryNode.cpp rename to moses/TranslationModel/PhraseDictionaryNode.cpp index 5b552bd53..5664038ab 100644 --- a/moses/PhraseDictionaryNode.cpp +++ b/moses/TranslationModel/PhraseDictionaryNode.cpp @@ -19,9 +19,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ***********************************************************************/ -#include "PhraseDictionaryNode.h" -#include "TargetPhrase.h" -#include "PhraseDictionaryMemory.h" +#include "moses/TranslationModel/PhraseDictionaryNode.h" +#include "moses/TargetPhrase.h" +#include "moses/TranslationModel/PhraseDictionaryMemory.h" namespace Moses { diff --git a/moses/PhraseDictionaryNode.h b/moses/TranslationModel/PhraseDictionaryNode.h similarity index 97% rename from moses/PhraseDictionaryNode.h rename to moses/TranslationModel/PhraseDictionaryNode.h index 69d013398..411c74cf0 100644 --- a/moses/PhraseDictionaryNode.h +++ b/moses/TranslationModel/PhraseDictionaryNode.h @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include -#include "Word.h" -#include "TargetPhraseCollection.h" +#include "moses/Word.h" +#include "moses/TargetPhraseCollection.h" namespace Moses { diff --git a/moses/PhraseDictionaryTree.cpp b/moses/TranslationModel/PhraseDictionaryTree.cpp similarity index 99% rename from moses/PhraseDictionaryTree.cpp rename to moses/TranslationModel/PhraseDictionaryTree.cpp index f5f2572f3..515d2f649 100644 --- a/moses/PhraseDictionaryTree.cpp +++ b/moses/TranslationModel/PhraseDictionaryTree.cpp @@ -1,7 +1,7 @@ // $Id$ // vim:tabstop=2 -#include "FeatureVector.h" -#include "PhraseDictionaryTree.h" +#include "moses/FeatureVector.h" +#include "moses/TranslationModel/PhraseDictionaryTree.h" #include #include "util/check.hh" #include diff --git a/moses/PhraseDictionaryTree.h b/moses/TranslationModel/PhraseDictionaryTree.h similarity index 93% rename from moses/PhraseDictionaryTree.h rename to moses/TranslationModel/PhraseDictionaryTree.h index f1f4df369..76a8bf3e3 100644 --- a/moses/PhraseDictionaryTree.h +++ b/moses/TranslationModel/PhraseDictionaryTree.h @@ -11,17 +11,17 @@ #include #endif -#include "TypeDef.h" -#include "Dictionary.h" +#include "moses/TypeDef.h" +#include "moses/Dictionary.h" -#include "PrefixTree.h" -#include "File.h" -#include "ObjectPool.h" -#include "LexicalReorderingTable.h" -#include "LVoc.h" -#include "TypeDef.h" -#include "Util.h" +#include "moses/PrefixTree.h" +#include "moses/File.h" +#include "moses/ObjectPool.h" +#include "moses/LexicalReorderingTable.h" +#include "moses/LVoc.h" +#include "moses/TypeDef.h" +#include "moses/Util.h" namespace Moses { diff --git a/moses/PhraseDictionaryTreeAdaptor.cpp b/moses/TranslationModel/PhraseDictionaryTreeAdaptor.cpp similarity index 87% rename from moses/PhraseDictionaryTreeAdaptor.cpp rename to moses/TranslationModel/PhraseDictionaryTreeAdaptor.cpp index 154572bce..f1cf337fb 100644 --- a/moses/PhraseDictionaryTreeAdaptor.cpp +++ b/moses/TranslationModel/PhraseDictionaryTreeAdaptor.cpp @@ -1,19 +1,19 @@ // $Id$ -#include "PhraseDictionaryTreeAdaptor.h" +#include "moses/TranslationModel/PhraseDictionaryTreeAdaptor.h" #include #include -#include "PhraseDictionaryTree.h" -#include "Phrase.h" -#include "FactorCollection.h" -#include "InputFileStream.h" -#include "InputType.h" -#include "ConfusionNet.h" -#include "Sentence.h" -#include "StaticData.h" -#include "UniqueObject.h" -#include "PDTAimp.h" -#include "UserMessage.h" +#include "moses/TranslationModel/PhraseDictionaryTree.h" +#include "moses/Phrase.h" +#include "moses/FactorCollection.h" +#include "moses/InputFileStream.h" +#include "moses/InputType.h" +#include "moses/ConfusionNet.h" +#include "moses/Sentence.h" +#include "moses/StaticData.h" +#include "moses/UniqueObject.h" +#include "moses/PDTAimp.h" +#include "moses/UserMessage.h" namespace Moses { diff --git a/moses/PhraseDictionaryTreeAdaptor.h b/moses/TranslationModel/PhraseDictionaryTreeAdaptor.h similarity index 94% rename from moses/PhraseDictionaryTreeAdaptor.h rename to moses/TranslationModel/PhraseDictionaryTreeAdaptor.h index a4ef19013..96feff7d8 100644 --- a/moses/PhraseDictionaryTreeAdaptor.h +++ b/moses/TranslationModel/PhraseDictionaryTreeAdaptor.h @@ -5,9 +5,9 @@ #include #include "util/check.hh" -#include "TypeDef.h" -#include "PhraseDictionaryMemory.h" -#include "TargetPhraseCollection.h" +#include "moses/TypeDef.h" +#include "moses/TargetPhraseCollection.h" +#include "moses/TranslationModel/PhraseDictionaryMemory.h" namespace Moses { diff --git a/moses/TranslationOption.cpp b/moses/TranslationOption.cpp index e15cf03c9..d9b4547a7 100644 --- a/moses/TranslationOption.cpp +++ b/moses/TranslationOption.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "TranslationOption.h" #include "WordsBitmap.h" -#include "PhraseDictionaryMemory.h" +#include "moses/TranslationModel/PhraseDictionaryMemory.h" #include "GenerationDictionary.h" #include "LMList.h" #include "LexicalReordering.h" diff --git a/moses/TranslationOptionCollection.cpp b/moses/TranslationOptionCollection.cpp index 87a750e98..3d553a458 100644 --- a/moses/TranslationOptionCollection.cpp +++ b/moses/TranslationOptionCollection.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "Sentence.h" #include "DecodeStep.h" #include "LM/Base.h" -#include "PhraseDictionaryMemory.h" +#include "moses/TranslationModel/PhraseDictionaryMemory.h" #include "FactorCollection.h" #include "InputType.h" #include "LexicalReordering.h" diff --git a/moses/TranslationOptionCollectionConfusionNet.cpp b/moses/TranslationOptionCollectionConfusionNet.cpp index c2713fb3a..47d936ec0 100644 --- a/moses/TranslationOptionCollectionConfusionNet.cpp +++ b/moses/TranslationOptionCollectionConfusionNet.cpp @@ -3,7 +3,7 @@ #include "TranslationOptionCollectionConfusionNet.h" #include "ConfusionNet.h" #include "DecodeStep.h" -#include "PhraseDictionaryMemory.h" +#include "moses/TranslationModel/PhraseDictionaryMemory.h" #include "FactorCollection.h" namespace Moses diff --git a/moses/TranslationOptionCollectionText.cpp b/moses/TranslationOptionCollectionText.cpp index c3676eaef..c19c8a9b0 100644 --- a/moses/TranslationOptionCollectionText.cpp +++ b/moses/TranslationOptionCollectionText.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "TranslationOptionCollectionText.h" #include "Sentence.h" #include "DecodeStep.h" -#include "PhraseDictionaryMemory.h" +#include "moses/TranslationModel/PhraseDictionaryMemory.h" #include "FactorCollection.h" #include "WordsRange.h"