From e8f418f10991668ae91926c26e6450c710c4475c Mon Sep 17 00:00:00 2001
From: Hieu Hoang <hieuhoang@gmail.com>
Date: Tue, 8 Nov 2016 22:19:39 +0000
Subject: =?UTF-8?q?implement=20=E2=80=93mark-unknown,=20-unknown-word-pref?=
 =?UTF-8?q?ix,=20and=20=E2=80=93unknown-word-suffix=20for=20backward=20com?=
 =?UTF-8?q?patibility?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contrib/moses2/FF/FeatureFunctions.cpp | 53 ++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/contrib/moses2/FF/FeatureFunctions.cpp b/contrib/moses2/FF/FeatureFunctions.cpp
index 53eb0f351..8ca145060 100644
--- a/contrib/moses2/FF/FeatureFunctions.cpp
+++ b/contrib/moses2/FF/FeatureFunctions.cpp
@@ -68,34 +68,43 @@ void FeatureFunctions::Create()
   UTIL_THROW_IF2(ffParams == NULL, "Must have [feature] section");
 
   BOOST_FOREACH(const std::string &line, *ffParams){
-  //cerr << "line=" << line << endl;
-  FeatureFunction *ff = Create(line);
+    //cerr << "line=" << line << endl;
+    FeatureFunction *ff = Create(line);
 
-  m_featureFunctions.push_back(ff);
+    m_featureFunctions.push_back(ff);
 
-  StatefulFeatureFunction *sfff = dynamic_cast<StatefulFeatureFunction*>(ff);
-  if (sfff) {
-    sfff->SetStatefulInd(m_statefulFeatureFunctions.size());
-    m_statefulFeatureFunctions.push_back(sfff);
-  }
+    StatefulFeatureFunction *sfff = dynamic_cast<StatefulFeatureFunction*>(ff);
+    if (sfff) {
+      sfff->SetStatefulInd(m_statefulFeatureFunctions.size());
+      m_statefulFeatureFunctions.push_back(sfff);
+    }
 
-  if (ff->HasPhraseTableInd()) {
-    ff->SetPhraseTableInd(m_withPhraseTableInd.size());
-    m_withPhraseTableInd.push_back(ff);
-  }
+    if (ff->HasPhraseTableInd()) {
+      ff->SetPhraseTableInd(m_withPhraseTableInd.size());
+      m_withPhraseTableInd.push_back(ff);
+    }
 
-  PhraseTable *pt = dynamic_cast<PhraseTable*>(ff);
-  if (pt) {
-    pt->SetPtInd(m_phraseTables.size());
-    m_phraseTables.push_back(pt);
-  }
+    PhraseTable *pt = dynamic_cast<PhraseTable*>(ff);
+    if (pt) {
+      pt->SetPtInd(m_phraseTables.size());
+      m_phraseTables.push_back(pt);
+    }
 
-  const UnknownWordPenalty *unkWP = dynamic_cast<const UnknownWordPenalty *>(pt);
-  if (unkWP) {
-	  m_unkWP = unkWP;
-  }
+    UnknownWordPenalty *unkWP = dynamic_cast<UnknownWordPenalty *>(pt);
+    if (unkWP) {
+      m_unkWP = unkWP;
 
-}
+      // legacy support
+      if (m_system.options.unk.drop) {
+        unkWP->SetParameter("drop", "true");
+      }
+      if (m_system.options.unk.mark) {
+        unkWP->SetParameter("prefix", m_system.options.unk.prefix);
+        unkWP->SetParameter("suffix", m_system.options.unk.suffix);
+      }
+    }
+
+  }
 }
 
 FeatureFunction *FeatureFunctions::Create(const std::string &line)
-- 
cgit v1.2.3