code clean up

7 files changed, 15 insertions, 17 deletions

diff --git a/moses2/Array.h b/moses2/Array.h
index d9402a704..fa6db557e 100644
--- a/moses2/Array.h
+++ b/moses2/Array.h
@@ -72,7 +72,7 @@ public:
   }
 
   void resize(size_t newSize) {
-    assert(m_size < m_maxSize);
+    assert(m_size <= m_maxSize);
     m_size = newSize;
   }
 protected:
diff --git a/moses2/InputType.cpp b/moses2/InputType.cpp
index af5b61ff9..889918a12 100644
--- a/moses2/InputType.cpp
+++ b/moses2/InputType.cpp
@@ -95,6 +95,7 @@ bool InputType::XmlOverlap(size_t startPos, size_t endPos) const
 std::string InputType::Debug(const System &system) const
 {
   cerr << "InputType::Debug" << endl;
+  return "";
 }
 
 } /* namespace Moses2 */
diff --git a/moses2/Moses2Wrapper.cpp b/moses2/Moses2Wrapper.cpp
index 2d7155e03..f919457d5 100644
--- a/moses2/Moses2Wrapper.cpp
+++ b/moses2/Moses2Wrapper.cpp
@@ -9,11 +9,9 @@ namespace Moses2 {
 		m_param->LoadParam(filePath);
 		m_system = new System(*m_param);
 	}
-	std::string Moses2Wrapper::Translate(const std::string &input) {
-		//create id
-		long a = 11234567;
-		TranslationTask task(*m_system, input, a);
-		std::string  translation = task.RunTranslation();
+	std::string Moses2Wrapper::Translate(const std::string &input , long id) {
+		TranslationTask task(*m_system, input, id);
+		std::string  translation = task.ReturnTranslation();
 		//delete translation;
 		return translation;
 	}
diff --git a/moses2/Moses2Wrapper.h b/moses2/Moses2Wrapper.h
index 01d021145..f491e1078 100644
--- a/moses2/Moses2Wrapper.h
+++ b/moses2/Moses2Wrapper.h
@@ -10,7 +10,7 @@ namespace Moses2 {
 
 	public:
 		Moses2Wrapper(const std::string &filePath);
-		std::string Translate(const std::string &input);
+		std::string Translate(const std::string &input, long id);
 	};
 
 }
\ No newline at end of file
diff --git a/moses2/PhraseBased/Manager.cpp b/moses2/PhraseBased/Manager.cpp
index 83cca53b1..a2a0ba0ad 100644
--- a/moses2/PhraseBased/Manager.cpp
+++ b/moses2/PhraseBased/Manager.cpp
@@ -60,9 +60,12 @@ void Manager::Init()
   InitPools();
 
   FactorCollection &vocab = system.GetVocab();
-  //TODO: need option to choose Sentence vs SentenceWithCandidates
-  m_input = Moses2::SentenceWithCandidates::CreateFromString(GetPool(), vocab, system, m_inputStr);
-  //cerr << "Manager::Init: " << m_input->Debug(system) << endl << flush;
+  if (system.options.input.input_type == SentenceInputWithCandidates) {
+      m_input = Moses2::SentenceWithCandidates::CreateFromString(GetPool(), vocab, system, m_inputStr);
+  }
+  else {
+      m_input = Moses2::Sentence::CreateFromString(GetPool(), vocab, system, m_inputStr);
+  }
   system.featureFunctions.InitializeForInput(*this, *m_input);
 
   m_bitmaps = new Bitmaps(GetPool());
@@ -92,7 +95,7 @@ void Manager::Init()
   CalcFutureScore();
 
   m_bitmaps->Init(sentence.GetSize(), vector<bool>(0));
-
+  
   switch (system.options.search.algo) {
   case Normal:
     m_search = new NSNormal::Search(*this);
diff --git a/moses2/TranslationTask.cpp b/moses2/TranslationTask.cpp
index 0032ab0b0..0644283b5 100644
--- a/moses2/TranslationTask.cpp
+++ b/moses2/TranslationTask.cpp
@@ -23,15 +23,11 @@ TranslationTask::TranslationTask(System &system,
 TranslationTask::~TranslationTask()
 {
 }
-std::string TranslationTask::RunTranslation() 
+std::string TranslationTask::ReturnTranslation() const
 {
     m_mgr->Decode();
-
     string out;
-
     out = m_mgr->OutputBest() + "\n";
-    
-
     delete m_mgr;
     return out;
 }
diff --git a/moses2/TranslationTask.h b/moses2/TranslationTask.h
index e683e1174..86e1766e1 100644
--- a/moses2/TranslationTask.h
+++ b/moses2/TranslationTask.h
@@ -16,7 +16,7 @@ public:
   TranslationTask(System &system, const std::string &line, long translationId);
   virtual ~TranslationTask();
   virtual void Run();
-  virtual std::string RunTranslation();
+  virtual std::string ReturnTranslation() const;
 
 protected:
   ManagerBase *m_mgr;