From 6bf2870f1860d4822ae0803ffe8c2c1fe641252f Mon Sep 17 00:00:00 2001
From: Hieu Hoang <fishandfrolick@gmail.com>
Date: Tue, 27 Nov 2012 16:31:42 +0000
Subject: [PATCH] move the rest of DynSA to TranslationModel/

---
 contrib/other-builds/moses/.project           | 262 ++++++++++++++++--
 .../BilingualDynSuffixArray.cpp               |   6 +-
 .../BilingualDynSuffixArray.h                 |   6 +-
 .../{ => TranslationModel}/DynSuffixArray.cpp |   0
 moses/{ => TranslationModel}/DynSuffixArray.h |   4 +-
 .../PhraseDictionaryDynSuffixArray.h          |   2 +-
 6 files changed, 250 insertions(+), 30 deletions(-)
 rename moses/{ => TranslationModel}/BilingualDynSuffixArray.cpp (99%)
 rename moses/{ => TranslationModel}/BilingualDynSuffixArray.h (98%)
 rename moses/{ => TranslationModel}/DynSuffixArray.cpp (100%)
 rename moses/{ => TranslationModel}/DynSuffixArray.h (96%)

diff --git a/contrib/other-builds/moses/.project b/contrib/other-builds/moses/.project
index 4ec42f1cf..dbf59c1ea 100644
--- a/contrib/other-builds/moses/.project
+++ b/contrib/other-builds/moses/.project
@@ -106,16 +106,6 @@
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses/AlignmentInfoTest.cpp</locationURI>
 		</link>
-		<link>
-			<name>BilingualDynSuffixArray.cpp</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses/BilingualDynSuffixArray.cpp</locationURI>
-		</link>
-		<link>
-			<name>BilingualDynSuffixArray.h</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses/BilingualDynSuffixArray.h</locationURI>
-		</link>
 		<link>
 			<name>BitmapContainer.cpp</name>
 			<type>1</type>
@@ -371,16 +361,6 @@
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses/DummyScoreProducers.h</locationURI>
 		</link>
-		<link>
-			<name>DynSuffixArray.cpp</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses/DynSuffixArray.cpp</locationURI>
-		</link>
-		<link>
-			<name>DynSuffixArray.h</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses/DynSuffixArray.h</locationURI>
-		</link>
 		<link>
 			<name>FFState.cpp</name>
 			<type>1</type>
@@ -1069,7 +1049,7 @@
 		<link>
 			<name>TranslationModel</name>
 			<type>2</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel</locationURI>
+			<locationURI>virtual:/virtual</locationURI>
 		</link>
 		<link>
 			<name>TranslationOption.cpp</name>
@@ -1816,6 +1796,101 @@
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses/Scope3Parser/VarSpanTrieBuilder.h</locationURI>
 		</link>
+		<link>
+			<name>TranslationModel/BilingualDynSuffixArray.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/BilingualDynSuffixArray.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/BilingualDynSuffixArray.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/BilingualDynSuffixArray.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude</name>
+			<type>2</type>
+			<locationURI>virtual:/virtual</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSuffixArray.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSuffixArray.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSuffixArray.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSuffixArray.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/Jamfile</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/Jamfile</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/PhraseDictionary.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/PhraseDictionary.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/PhraseDictionary.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/PhraseDictionary.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/PhraseDictionaryDynSuffixArray.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/PhraseDictionaryDynSuffixArray.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/PhraseDictionaryDynSuffixArray.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/PhraseDictionaryDynSuffixArray.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/PhraseDictionaryMemory.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/PhraseDictionaryMemory.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/PhraseDictionaryMemory.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/PhraseDictionaryMemory.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/PhraseDictionaryNode.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/PhraseDictionaryNode.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/PhraseDictionaryNode.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/PhraseDictionaryNode.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/PhraseDictionaryTree.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/PhraseDictionaryTree.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/PhraseDictionaryTree.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/PhraseDictionaryTree.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/PhraseDictionaryTreeAdaptor.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/PhraseDictionaryTreeAdaptor.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/PhraseDictionaryTreeAdaptor.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/PhraseDictionaryTreeAdaptor.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/fuzzy-match</name>
+			<type>2</type>
+			<locationURI>virtual:/virtual</locationURI>
+		</link>
 		<link>
 			<name>CompactPT/bin/gcc-4.6</name>
 			<type>2</type>
@@ -1836,6 +1911,151 @@
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses/LM/bin/lm.log</locationURI>
 		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/FileHandler.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/FileHandler.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/FileHandler.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/FileHandler.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/Jamfile</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/Jamfile</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/RandLMCache.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/RandLMCache.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/RandLMFilter.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/RandLMFilter.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/fdstream.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/fdstream.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/hash.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/hash.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/onlineRLM.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/onlineRLM.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/params.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/params.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/params.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/params.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/perfectHash.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/perfectHash.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/quantizer.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/quantizer.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/types.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/types.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/utils.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/utils.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/vocab.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/vocab.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/DynSAInclude/vocab.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/DynSAInclude/vocab.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/fuzzy-match/Alignments.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/fuzzy-match/Alignments.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/fuzzy-match/Alignments.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/fuzzy-match/Alignments.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/fuzzy-match/FuzzyMatchWrapper.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/fuzzy-match/FuzzyMatchWrapper.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/fuzzy-match/FuzzyMatchWrapper.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/fuzzy-match/FuzzyMatchWrapper.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/fuzzy-match/Match.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/fuzzy-match/Match.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/fuzzy-match/SentenceAlignment.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/fuzzy-match/SentenceAlignment.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/fuzzy-match/SentenceAlignment.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/fuzzy-match/SentenceAlignment.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/fuzzy-match/SuffixArray.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/fuzzy-match/SuffixArray.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/fuzzy-match/SuffixArray.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/fuzzy-match/SuffixArray.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/fuzzy-match/Vocabulary.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/fuzzy-match/Vocabulary.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/fuzzy-match/Vocabulary.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/fuzzy-match/Vocabulary.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/fuzzy-match/create_xml.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/fuzzy-match/create_xml.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationModel/fuzzy-match/create_xml.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/fuzzy-match/create_xml.h</locationURI>
+		</link>
 		<link>
 			<name>CompactPT/bin/gcc-4.6/release</name>
 			<type>2</type>
diff --git a/moses/BilingualDynSuffixArray.cpp b/moses/TranslationModel/BilingualDynSuffixArray.cpp
similarity index 99%
rename from moses/BilingualDynSuffixArray.cpp
rename to moses/TranslationModel/BilingualDynSuffixArray.cpp
index c78c01deb..0d90067c6 100644
--- a/moses/BilingualDynSuffixArray.cpp
+++ b/moses/TranslationModel/BilingualDynSuffixArray.cpp
@@ -1,8 +1,8 @@
 #include "BilingualDynSuffixArray.h"
 #include "moses/TranslationModel/DynSAInclude/utils.h"
-#include "FactorCollection.h"
-#include "StaticData.h"
-#include "TargetPhrase.h"
+#include "moses/FactorCollection.h"
+#include "moses/StaticData.h"
+#include "moses/TargetPhrase.h"
 #include <iomanip>
 
 using namespace std;
diff --git a/moses/BilingualDynSuffixArray.h b/moses/TranslationModel/BilingualDynSuffixArray.h
similarity index 98%
rename from moses/BilingualDynSuffixArray.h
rename to moses/TranslationModel/BilingualDynSuffixArray.h
index 2e93e1943..bbf238114 100644
--- a/moses/BilingualDynSuffixArray.h
+++ b/moses/TranslationModel/BilingualDynSuffixArray.h
@@ -1,13 +1,13 @@
 #ifndef moses_BilingualDynSuffixArray_h
 #define moses_BilingualDynSuffixArray_h
 
-#include "TargetPhrase.h"
 #include "DynSuffixArray.h" 
 #include "moses/TranslationModel/DynSAInclude/vocab.h"
 #include "moses/TranslationModel/DynSAInclude/types.h"
 #include "moses/TranslationModel/DynSAInclude/utils.h"
-#include "InputFileStream.h"
-#include "FactorTypeSet.h"
+#include "moses/InputFileStream.h"
+#include "moses/FactorTypeSet.h"
+#include "moses/TargetPhrase.h"
 
 namespace Moses {
 
diff --git a/moses/DynSuffixArray.cpp b/moses/TranslationModel/DynSuffixArray.cpp
similarity index 100%
rename from moses/DynSuffixArray.cpp
rename to moses/TranslationModel/DynSuffixArray.cpp
diff --git a/moses/DynSuffixArray.h b/moses/TranslationModel/DynSuffixArray.h
similarity index 96%
rename from moses/DynSuffixArray.h
rename to moses/TranslationModel/DynSuffixArray.h
index fd41472f2..024d6daf1 100644
--- a/moses/DynSuffixArray.h
+++ b/moses/TranslationModel/DynSuffixArray.h
@@ -5,8 +5,8 @@
 #include <set>
 #include <algorithm>
 #include <utility>
-#include "Util.h"
-#include "File.h"
+#include "moses/Util.h"
+#include "moses/File.h"
 #include "moses/TranslationModel/DynSAInclude/types.h"
 
 namespace Moses
diff --git a/moses/TranslationModel/PhraseDictionaryDynSuffixArray.h b/moses/TranslationModel/PhraseDictionaryDynSuffixArray.h
index ebad9ad61..25d8d6eb1 100644
--- a/moses/TranslationModel/PhraseDictionaryDynSuffixArray.h
+++ b/moses/TranslationModel/PhraseDictionaryDynSuffixArray.h
@@ -4,7 +4,7 @@
 #include <map>
 
 #include "moses/TranslationModel/PhraseDictionary.h"
-#include "moses/BilingualDynSuffixArray.h"
+#include "moses/TranslationModel/BilingualDynSuffixArray.h"
 
 namespace Moses
 {