move Moses classes out of OnDiskPt

3 files changed, 52 insertions, 7 deletions

diff --git a/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerOnDisk.cpp b/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerOnDisk.cpp
index 04f8db219..5a5a1368a 100644
--- a/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerOnDisk.cpp
+++ b/moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerOnDisk.cpp
@@ -251,12 +251,13 @@ void ChartRuleLookupManagerOnDisk::GetChartRuleCollection(
 
             std::vector<float> weightT = staticData.GetWeights(&m_dictionary);
             targetPhraseCollection
-            = tpcollBerkeleyDb->ConvertToMoses(m_inputFactorsVec
-                                               ,m_outputFactorsVec
-                                               ,m_dictionary
-                                               ,weightT
-                                               ,m_dbWrapper.GetVocab()
-                                               ,true);
+            = m_dictionary.ConvertToMoses(tpcollBerkeleyDb
+            						   ,m_inputFactorsVec
+									   ,m_outputFactorsVec
+									   ,m_dictionary
+									   ,weightT
+									   ,m_dbWrapper.GetVocab()
+									   ,true);
 
             tpcollBerkeleyDb.reset();
             m_cache[tpCollFilePos] = targetPhraseCollection;
diff --git a/moses/TranslationModel/RuleTable/PhraseDictionaryOnDisk.cpp b/moses/TranslationModel/RuleTable/PhraseDictionaryOnDisk.cpp
index adb3f36c1..9ca2c9b0b 100644
--- a/moses/TranslationModel/RuleTable/PhraseDictionaryOnDisk.cpp
+++ b/moses/TranslationModel/RuleTable/PhraseDictionaryOnDisk.cpp
@@ -206,7 +206,7 @@ GetTargetPhraseCollectionNonCache(const OnDiskPt::PhraseNode *ptNode) const
   OnDiskPt::TargetPhraseCollection::shared_ptr targetPhrasesOnDisk
   = ptNode->GetTargetPhraseCollection(m_tableLimit, wrapper);
   TargetPhraseCollection::shared_ptr targetPhrases
-  = targetPhrasesOnDisk->ConvertToMoses(m_input, m_output, *this,
+  = ConvertToMoses(targetPhrasesOnDisk, m_input, m_output, *this,
                                         weightT, vocab, false);
 
   // delete targetPhrasesOnDisk;
@@ -214,6 +214,40 @@ GetTargetPhraseCollectionNonCache(const OnDiskPt::PhraseNode *ptNode) const
   return targetPhrases;
 }
 
+Moses::TargetPhraseCollection::shared_ptr
+PhraseDictionaryOnDisk::ConvertToMoses(
+	const OnDiskPt::TargetPhraseCollection::shared_ptr targetPhrasesOnDisk
+	, const std::vector<Moses::FactorType> &inputFactors
+    , const std::vector<Moses::FactorType> &outputFactors
+    , const Moses::PhraseDictionary &phraseDict
+    , const std::vector<float> &weightT
+    , OnDiskPt::Vocab &vocab
+    , bool isSyntax) const
+{
+	  Moses::TargetPhraseCollection::shared_ptr ret;
+	  ret.reset(new Moses::TargetPhraseCollection);
+
+	  for (size_t i = 0; i < targetPhrasesOnDisk->GetSize(); ++i) {
+	    const OnDiskPt::TargetPhrase &tp = targetPhrasesOnDisk->GetTargetPhrase(i);
+	    Moses::TargetPhrase *mosesPhrase
+	    = tp.ConvertToMoses(inputFactors, outputFactors, vocab,
+	                        phraseDict, weightT, isSyntax);
+
+	    /*
+	    // debugging output
+	    stringstream strme;
+	    strme << filePath << " " << *mosesPhrase;
+	    mosesPhrase->SetDebugOutput(strme.str());
+	    */
+
+	    ret->Add(mosesPhrase);
+	  }
+
+	  ret->Sort(true, phraseDict.GetTableLimit());
+
+	  return ret;
+}
+
 void PhraseDictionaryOnDisk::SetParameter(const std::string& key, const std::string& value)
 {
   if (key == "max-span-default") {
diff --git a/moses/TranslationModel/RuleTable/PhraseDictionaryOnDisk.h b/moses/TranslationModel/RuleTable/PhraseDictionaryOnDisk.h
index 1bd357d05..7a0c06c4a 100644
--- a/moses/TranslationModel/RuleTable/PhraseDictionaryOnDisk.h
+++ b/moses/TranslationModel/RuleTable/PhraseDictionaryOnDisk.h
@@ -84,6 +84,16 @@ public:
   TargetPhraseCollection::shared_ptr
   GetTargetPhraseCollectionNonCache(const OnDiskPt::PhraseNode *ptNode) const;
 
+  Moses::TargetPhraseCollection::shared_ptr
+  ConvertToMoses(
+  	const OnDiskPt::TargetPhraseCollection::shared_ptr targetPhrasesOnDisk
+  	, const std::vector<Moses::FactorType> &inputFactors
+      , const std::vector<Moses::FactorType> &outputFactors
+      , const Moses::PhraseDictionary &phraseDict
+      , const std::vector<float> &weightT
+      , OnDiskPt::Vocab &vocab
+      , bool isSyntax) const;
+
   void SetParameter(const std::string& key, const std::string& value);
 
 };