PhraseOrientationFeature

2 files changed, 15 insertions, 7 deletions

diff --git a/moses/PP/OrientationPhraseProperty.cpp b/moses/PP/OrientationPhraseProperty.cpp
index 653a1bf3b..1722a5383 100644
--- a/moses/PP/OrientationPhraseProperty.cpp
+++ b/moses/PP/OrientationPhraseProperty.cpp
@@ -8,13 +8,13 @@ namespace Moses
 void OrientationPhraseProperty::ProcessValue(const std::string &value)
 {
   // bidirectional MSLR phrase orientation with 2x4 orientation classes: 
-  // mono swap dright dleft
+  // mono swap dleft dright
 
   std::istringstream tokenizer(value);
 
   try {
-    if (! (tokenizer >> m_l2rMonoProbability >> m_l2rSwapProbability >> m_l2rDrightProbability >> m_l2rDleftProbability
-                     >> m_r2lMonoProbability >> m_r2lSwapProbability >> m_r2lDrightProbability >> m_r2lDleftProbability)) {
+    if (! (tokenizer >> m_l2rMonoProbability >> m_l2rSwapProbability >> m_l2rDleftProbability >> m_l2rDrightProbability
+                     >> m_r2lMonoProbability >> m_r2lSwapProbability >> m_r2lDleftProbability >> m_r2lDrightProbability)) {
       UTIL_THROW2("OrientationPhraseProperty: Not able to read value. Flawed property?");
     }
   } catch (const std::exception &e) {
diff --git a/moses/PP/OrientationPhraseProperty.h b/moses/PP/OrientationPhraseProperty.h
index 32c6ff208..f6344062c 100644
--- a/moses/PP/OrientationPhraseProperty.h
+++ b/moses/PP/OrientationPhraseProperty.h
@@ -24,12 +24,16 @@ public:
     return m_l2rSwapProbability;
   };
 
+  double GetLeftToRightProbabilityDleft() const {
+    return m_l2rDleftProbability;
+  };
+
   double GetLeftToRightProbabilityDright() const {
     return m_l2rDrightProbability;
   };
 
-  double GetLeftToRightProbabilityDleft() const {
-    return m_l2rDleftProbability;
+  double GetLeftToRightProbabilityDiscontinuous() const {
+    return m_l2rDleftProbability + m_l2rDrightProbability;
   };
 
 
@@ -41,12 +45,16 @@ public:
     return m_r2lSwapProbability;
   };
 
+  double GetRightToLeftProbabilityDleft() const {
+    return m_r2lDleftProbability;
+  };
+
   double GetRightToLeftProbabilityDright() const {
     return m_r2lDrightProbability;
   };
 
-  double GetRightToLeftProbabilityDleft() const {
-    return m_r2lDleftProbability;
+  double GetRightToLeftProbabilityDiscontinuous() const {
+    return m_r2lDleftProbability + m_r2lDrightProbability;
   };