new version of the `score` tool

which is now capable of dealing with additional properties in an appropriate manner

1 files changed, 16 insertions, 17 deletions

diff --git a/phrase-extract/InternalStructFeature.h b/phrase-extract/InternalStructFeature.h
index bd513a715..7a6efec1d 100644
--- a/phrase-extract/InternalStructFeature.h
+++ b/phrase-extract/InternalStructFeature.h
@@ -21,22 +21,19 @@ 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;
+        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;
+                 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;
+	/** 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;
 
 };
@@ -47,9 +44,10 @@ public:
 	InternalStructFeatureDense()
 		:InternalStructFeature(){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
@@ -58,9 +56,10 @@ public:
 	InternalStructFeatureSparse()
 		:InternalStructFeature(){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;
 };
 
 }