merged master into dynamic-models and solved conflicts

1 files changed, 19 insertions, 21 deletions

diff --git a/phrase-extract/InternalStructFeature.h b/phrase-extract/InternalStructFeature.h
index fe6dedc15..7969dc8a8 100644
--- a/phrase-extract/InternalStructFeature.h
+++ b/phrase-extract/InternalStructFeature.h
@@ -21,24 +21,20 @@ namespace MosesTraining
 class InternalStructFeature : public ScoreFeature
 {
 public:
-  InternalStructFeature();
-  /** Return true if the two phrase pairs are equal from the point of this feature. Assume
-        that they already compare true according to PhraseAlignment.equals()
-     **/
-  bool equals(const PhraseAlignment& lhs, const PhraseAlignment& rhs) const;
-  /** Add the values for this feature function. */
-  void add(const ScoreFeatureContext& context,
-           std::vector<float>& denseValues,
-           std::map<std::string,float>& sparseValues) const;
+        InternalStructFeature() : m_type(0) {};
+	/** Add the values for this feature function. */
+	void add(const ScoreFeatureContext& context,
+                 std::vector<float>& denseValues,
+                 std::map<std::string,float>& sparseValues) const;
 
 
 protected:
-  /** Overriden in subclass */
-  virtual void add(std::string *internalStruct,
-                   std::vector<float>& denseValues,
-                   std::map<std::string,float>& sparseValues) const = 0;
-  int m_type;
-
+	/** Overridden in subclass */
+	 virtual void add(const std::string *treeFragment,
+                          float count,
+                          std::vector<float>& denseValues,
+                          std::map<std::string,float>& sparseValues) const = 0;
+	int m_type;
 };
 
 class InternalStructFeatureDense : public InternalStructFeature
@@ -49,9 +45,10 @@ public:
     m_type=1;
   } //std::cout<<"InternalStructFeatureDense: Construct "<<m_type<<"\n";}
 protected:
-  virtual void add(std::string *internalStruct,
-                   std::vector<float>& denseValues,
-                   std::map<std::string,float>& sparseValues) const;
+	virtual void add(const std::string *treeFragment,
+                         float count,
+                         std::vector<float>& denseValues,
+                         std::map<std::string,float>& sparseValues) const;
 };
 
 class InternalStructFeatureSparse : public InternalStructFeature
@@ -62,9 +59,10 @@ public:
     m_type=2;
   }// std::cout<<"InternalStructFeatureSparse: Construct "<<m_type<<"\n";}
 protected:
-  virtual void add(std::string *internalStruct,
-                   std::vector<float>& denseValues,
-                   std::map<std::string,float>& sparseValues) const;
+	virtual void add(const std::string *treeFragment,
+                         float count,
+                         std::vector<float>& denseValues,
+                         std::map<std::string,float>& sparseValues) const;
 };
 
 }