move TranslationTask into moses/

13 files changed, 34 insertions, 35 deletions

diff --git a/contrib/other-builds/moses-chart-cmd/.project b/contrib/other-builds/moses-chart-cmd/.project
index 8ef6c9b35..16eb28b21 100644
--- a/contrib/other-builds/moses-chart-cmd/.project
+++ b/contrib/other-builds/moses-chart-cmd/.project
@@ -102,16 +102,6 @@
 			<locationURI>PARENT-3-PROJECT_LOC/moses-chart-cmd/Main.h</locationURI>
 		</link>
 		<link>
-			<name>TranslationTask.cpp</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses-chart-cmd/TranslationTask.cpp</locationURI>
-		</link>
-		<link>
-			<name>TranslationTask.h</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses-chart-cmd/TranslationTask.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 ce4e0a168..432c15321 100644
--- a/contrib/other-builds/moses-cmd/.project
+++ b/contrib/other-builds/moses-cmd/.project
@@ -107,16 +107,6 @@
 			<locationURI>PARENT-3-PROJECT_LOC/moses-cmd/Main.h</locationURI>
 		</link>
 		<link>
-			<name>TranslationTask.cpp</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses-cmd/TranslationTask.cpp</locationURI>
-		</link>
-		<link>
-			<name>TranslationTask.h</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses-cmd/TranslationTask.h</locationURI>
-		</link>
-		<link>
 			<name>mbr.cpp</name>
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses-cmd/mbr.cpp</locationURI>
diff --git a/contrib/other-builds/moses/.project b/contrib/other-builds/moses/.project
index 879819182..60e801195 100644
--- a/contrib/other-builds/moses/.project
+++ b/contrib/other-builds/moses/.project
@@ -917,6 +917,26 @@
 			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationOptionList.h</locationURI>
 		</link>
 		<link>
+			<name>TranslationTask.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationTask.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationTask.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationTask.h</locationURI>
+		</link>
+		<link>
+			<name>TranslationTaskChart.cpp</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationTaskChart.cpp</locationURI>
+		</link>
+		<link>
+			<name>TranslationTaskChart.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationTaskChart.h</locationURI>
+		</link>
+		<link>
 			<name>TreeInput.cpp</name>
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses/TreeInput.cpp</locationURI>
diff --git a/moses-chart-cmd/Jamfile b/moses-chart-cmd/Jamfile
index 2c4909ef8..fe84871c7 100644
--- a/moses-chart-cmd/Jamfile
+++ b/moses-chart-cmd/Jamfile
@@ -1,2 +1,2 @@
-exe moses_chart : Main.cpp mbr.cpp TranslationTask.cpp ../moses//moses $(TOP)//boost_iostreams ..//boost_filesystem ..//z ;
+exe moses_chart : Main.cpp mbr.cpp ../moses//moses $(TOP)//boost_iostreams ..//boost_filesystem ..//z ;
 
diff --git a/moses-chart-cmd/Main.cpp b/moses-chart-cmd/Main.cpp
index 9d10f7b52..f3d23e547 100644
--- a/moses-chart-cmd/Main.cpp
+++ b/moses-chart-cmd/Main.cpp
@@ -59,11 +59,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "moses/ChartHypothesis.h"
 #include "moses/FF/StatefulFeatureFunction.h"
 #include "moses/FF/StatelessFeatureFunction.h"
+#include "moses/TranslationTaskChart.h"
 
 #include "util/usage.hh"
 #include "util/exception.hh"
 
-#include "TranslationTask.h"
 
 
 using namespace std;
@@ -191,7 +191,7 @@ int main(int argc, char* argv[])
 
       FeatureFunction::CallChangeSource(source);
 
-      TranslationTask *task = new TranslationTask(source, *ioWrapper, hypergraphOutput);
+      TranslationTaskChart *task = new TranslationTaskChart(source, *ioWrapper, hypergraphOutput);
       source = NULL;  // task will delete source
 #ifdef WITH_THREADS
       pool.Submit(task);  // pool will delete task
diff --git a/moses-cmd/Jamfile b/moses-cmd/Jamfile
index 993e0df02..7ee90850c 100644
--- a/moses-cmd/Jamfile
+++ b/moses-cmd/Jamfile
@@ -1,4 +1,4 @@
-alias deps : mbr.cpp TranslationTask.cpp ..//z ..//boost_iostreams ..//boost_filesystem ../moses//moses ;
+alias deps :  ..//z ..//boost_iostreams ..//boost_filesystem ../moses//moses ;
 
 exe moses : Main.cpp deps ;
 exe lmbrgrid : LatticeMBRGrid.cpp deps ;
diff --git a/moses-cmd/Main.cpp b/moses-cmd/Main.cpp
index 1aace5401..8328ddc78 100644
--- a/moses-cmd/Main.cpp
+++ b/moses-cmd/Main.cpp
@@ -45,8 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include "moses/TranslationModel/PhraseDictionary.h"
 #include "moses/FF/StatefulFeatureFunction.h"
 #include "moses/FF/StatelessFeatureFunction.h"
-
-#include "TranslationTask.h"
+#include "moses/TranslationTask.h"
 
 #ifdef HAVE_PROTOBUF
 #include "hypergraph.pb.h"
diff --git a/moses-cmd/TranslationTask.cpp b/moses/TranslationTask.cpp
index 65e7e08bc..65e7e08bc 100644
--- a/moses-cmd/TranslationTask.cpp
+++ b/moses/TranslationTask.cpp
diff --git a/moses-cmd/TranslationTask.h b/moses/TranslationTask.h
index 05b257a6a..05b257a6a 100644
--- a/moses-cmd/TranslationTask.h
+++ b/moses/TranslationTask.h
diff --git a/moses-chart-cmd/TranslationTask.cpp b/moses/TranslationTaskChart.cpp
index 331288fb3..5cdcd4e6f 100644
--- a/moses-chart-cmd/TranslationTask.cpp
+++ b/moses/TranslationTaskChart.cpp
@@ -1,4 +1,4 @@
-#include "TranslationTask.h"
+#include "TranslationTaskChart.h"
 #include "moses/Sentence.h"
 #include "moses/StaticData.h"
 #include "moses/Incremental.h"
@@ -9,18 +9,18 @@ using namespace std;
 using namespace Moses;
 using namespace MosesChartCmd;
 
-TranslationTask::TranslationTask(InputType *source, IOWrapperChart &ioWrapper,
+TranslationTaskChart::TranslationTaskChart(InputType *source, IOWrapperChart &ioWrapper,
 boost::shared_ptr<HypergraphOutput<ChartManager> > hypergraphOutput)
 : m_source(source)
 , m_ioWrapper(ioWrapper)
 , m_hypergraphOutput(hypergraphOutput)
 {}
 
-TranslationTask::~TranslationTask() {
+TranslationTaskChart::~TranslationTaskChart() {
   delete m_source;
 }
 
-void TranslationTask::Run() {
+void TranslationTaskChart::Run() {
 const StaticData &staticData = StaticData::Instance();
 const size_t translationId = m_source->GetTranslationId();
 
diff --git a/moses-chart-cmd/TranslationTask.h b/moses/TranslationTaskChart.h
index aefc8b9eb..7269655e5 100644
--- a/moses-chart-cmd/TranslationTask.h
+++ b/moses/TranslationTaskChart.h
@@ -19,20 +19,20 @@ namespace MosesChartCmd
 /**
   * Translates a sentence.
  **/
-class TranslationTask : public Moses::Task
+class TranslationTaskChart : public Moses::Task
 {
 public:
-  TranslationTask(Moses::InputType *source, MosesChartCmd::IOWrapperChart &ioWrapper,
+  TranslationTaskChart(Moses::InputType *source, MosesChartCmd::IOWrapperChart &ioWrapper,
     boost::shared_ptr<Moses::HypergraphOutput<Moses::ChartManager> > hypergraphOutput);
 
-  ~TranslationTask();
+  ~TranslationTaskChart();
 
   void Run();
 
 private:
   // Non-copyable: copy constructor and assignment operator not implemented.
-  TranslationTask(const TranslationTask &);
-  TranslationTask &operator=(const TranslationTask &);
+  TranslationTaskChart(const TranslationTaskChart &);
+  TranslationTaskChart &operator=(const TranslationTaskChart &);
 
   Moses::InputType *m_source;
   MosesChartCmd::IOWrapperChart &m_ioWrapper;
diff --git a/moses-cmd/mbr.cpp b/moses/mbr.cpp
index 6a8dfa823..6a8dfa823 100644
--- a/moses-cmd/mbr.cpp
+++ b/moses/mbr.cpp
diff --git a/moses-cmd/mbr.h b/moses/mbr.h
index d08b11a98..d08b11a98 100644
--- a/moses-cmd/mbr.h
+++ b/moses/mbr.h