move LatticeMBR into moses/

9 files changed, 14 insertions, 24 deletions

diff --git a/contrib/other-builds/moses-chart-cmd/.project b/contrib/other-builds/moses-chart-cmd/.project
index 5022e23ff..e59b8b8f7 100644
--- a/contrib/other-builds/moses-chart-cmd/.project
+++ b/contrib/other-builds/moses-chart-cmd/.project
@@ -112,16 +112,6 @@
 			<locationURI>PARENT-3-PROJECT_LOC/moses-chart-cmd/Main.h</locationURI>
 		</link>
 		<link>
-			<name>TranslationAnalysis.cpp</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses-chart-cmd/TranslationAnalysis.cpp</locationURI>
-		</link>
-		<link>
-			<name>TranslationAnalysis.h</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses-chart-cmd/TranslationAnalysis.h</locationURI>
-		</link>
-		<link>
 			<name>mbr.cpp</name>
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses-chart-cmd/mbr.cpp</locationURI>
diff --git a/contrib/other-builds/moses-cmd/.project b/contrib/other-builds/moses-cmd/.project
index accd6b902..52e2accfd 100644
--- a/contrib/other-builds/moses-cmd/.project
+++ b/contrib/other-builds/moses-cmd/.project
@@ -102,16 +102,6 @@
 			<locationURI>PARENT-3-PROJECT_LOC/moses-cmd/Jamfile</locationURI>
 		</link>
 		<link>
-			<name>LatticeMBR.cpp</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses-cmd/LatticeMBR.cpp</locationURI>
-		</link>
-		<link>
-			<name>LatticeMBR.h</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses-cmd/LatticeMBR.h</locationURI>
-		</link>
-		<link>
 			<name>LatticeMBRGrid.cpp</name>
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses-cmd/LatticeMBRGrid.cpp</locationURI>
diff --git a/contrib/other-builds/moses/.project b/contrib/other-builds/moses/.project
index 9c1eebd4b..2c8699956 100644
--- a/contrib/other-builds/moses/.project
+++ b/contrib/other-builds/moses/.project
@@ -492,6 +492,16 @@
 			<locationURI>PARENT-3-PROJECT_LOC/moses/LVoc.h</locationURI>
 		</link>
 		<link>
+			<name>LatticeMBR.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/LatticeMBR.cpp</locationURI>
+		</link>
+		<link>
+			<name>LatticeMBR.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/LatticeMBR.h</locationURI>
+		</link>
+		<link>
 			<name>Manager.cpp</name>
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses/Manager.cpp</locationURI>
diff --git a/moses-chart-cmd/Main.cpp b/moses-chart-cmd/Main.cpp
index a90f69012..f5f053ada 100644
--- a/moses-chart-cmd/Main.cpp
+++ b/moses-chart-cmd/Main.cpp
@@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <exception>
 #include <fstream>
 #include "Main.h"
-#include "TranslationAnalysis.h"
+#include "moses/TranslationAnalysis.h"
 #include "mbr.h"
 #include "IOWrapper.h"
 
diff --git a/moses-cmd/IOWrapper.h b/moses-cmd/IOWrapper.h
index 93539ce0b..ed2537986 100644
--- a/moses-cmd/IOWrapper.h
+++ b/moses-cmd/IOWrapper.h
@@ -50,7 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "moses/InputFileStream.h"
 #include "moses/InputType.h"
 #include "moses/WordLattice.h"
-#include "LatticeMBR.h"
+#include "moses/LatticeMBR.h"
 
 namespace Moses
 {
diff --git a/moses-cmd/Jamfile b/moses-cmd/Jamfile
index 4f7e0e773..8d54e0515 100644
--- a/moses-cmd/Jamfile
+++ b/moses-cmd/Jamfile
@@ -1,4 +1,4 @@
-alias deps : IOWrapper.cpp mbr.cpp LatticeMBR.cpp ..//z ..//boost_iostreams ..//boost_filesystem ../moses//moses ;
+alias deps : IOWrapper.cpp mbr.cpp ..//z ..//boost_iostreams ..//boost_filesystem ../moses//moses ;
 
 exe moses : Main.cpp deps ;
 exe lmbrgrid : LatticeMBRGrid.cpp deps ;
diff --git a/moses-cmd/LatticeMBRGrid.cpp b/moses-cmd/LatticeMBRGrid.cpp
index 4c6b421fc..904275339 100644
--- a/moses-cmd/LatticeMBRGrid.cpp
+++ b/moses-cmd/LatticeMBRGrid.cpp
@@ -47,7 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <set>
 
 #include "IOWrapper.h"
-#include "LatticeMBR.h"
+#include "moses/LatticeMBR.h"
 #include "moses/Manager.h"
 #include "moses/StaticData.h"
 #include "util/exception.hh"
diff --git a/moses-cmd/LatticeMBR.cpp b/moses/LatticeMBR.cpp
index 148b44743..148b44743 100644
--- a/moses-cmd/LatticeMBR.cpp
+++ b/moses/LatticeMBR.cpp
diff --git a/moses-cmd/LatticeMBR.h b/moses/LatticeMBR.h
index ab8b3cb76..ab8b3cb76 100644
--- a/moses-cmd/LatticeMBR.h
+++ b/moses/LatticeMBR.h