merge

2 files changed, 10 insertions, 5 deletions

diff --git a/moses/PP/SpanLengthPhraseProperty.cpp b/moses/PP/SpanLengthPhraseProperty.cpp
index 4bc29713a..d45c7b919 100644
--- a/moses/PP/SpanLengthPhraseProperty.cpp
+++ b/moses/PP/SpanLengthPhraseProperty.cpp
@@ -6,8 +6,11 @@ using namespace std;
 
 namespace Moses
 {
-SpanLengthPhraseProperty::SpanLengthPhraseProperty(const std::string &value)
-: PhraseProperty(value)
+SpanLengthPhraseProperty::SpanLengthPhraseProperty()
+{
+}
+
+void SpanLengthPhraseProperty::ProcessValue(const std::string &value)
 {
   vector<string> toks;
   Tokenize(toks, value);
@@ -24,9 +27,9 @@ SpanLengthPhraseProperty::SpanLengthPhraseProperty(const std::string &value)
 
 	  if (toks.size() == 1) {
 		float count = Scan<float>(toks[0]);
-  	    Populate(indices, count);
+		Populate(indices, count);
 
-  	    indices.clear();
+		indices.clear();
 	  }
 	  else {
 		indices.insert(toks);
diff --git a/moses/PP/SpanLengthPhraseProperty.h b/moses/PP/SpanLengthPhraseProperty.h
index 44f972005..982c3ca0d 100644
--- a/moses/PP/SpanLengthPhraseProperty.h
+++ b/moses/PP/SpanLengthPhraseProperty.h
@@ -13,7 +13,9 @@ namespace Moses
 class SpanLengthPhraseProperty : public PhraseProperty
 {
 public:
-	SpanLengthPhraseProperty(const std::string &value);
+	SpanLengthPhraseProperty();
+
+    void ProcessValue(const std::string &value);
 
 	float GetProb(size_t ntInd, size_t sourceWidth, float smoothing) const;
 protected: