- made output more compliant with old version

- added PerSCorer.h and BleuScorer.h
- stored feature names
- fixed bug about output of best Point


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1796 1f5c12ca-751b-0410-a591-d2e778427230

1 files changed, 13 insertions, 2 deletions

diff --git a/mert/Point.cpp b/mert/Point.cpp
index af9316679..25a0a3529 100644
--- a/mert/Point.cpp
+++ b/mert/Point.cpp
@@ -20,17 +20,28 @@ void Point::Randomize(const vector<parameter_t>& min,const vector<parameter_t>&
     operator[](i)= min[i] + (float)random()/(float)RAND_MAX * (float)(max[i]-min[i]);
 }
 
-void Point::Normalize(){
+void Point::NormalizeL2(){
   parameter_t norm=0.0;
   for (unsigned int i=0; i<size(); i++)
     norm+= operator[](i)*operator[](i);
-  if(norm!=0.0){
+		if(norm!=0.0){
     norm=sqrt(norm);
     for (unsigned int i=0; i<size(); i++)
       operator[](i)/=norm;
   }
 }
 
+
+void Point::NormalizeL1(){
+  parameter_t norm=0.0;
+  for (unsigned int i=0; i<size(); i++)
+    norm+= abs(operator[](i));
+		if(norm!=0.0){
+			for (unsigned int i=0; i<size(); i++)
+				operator[](i)/=norm;
+		}
+}
+
 //Can initialize from a vector of dim or pdim
 Point::Point(const vector<parameter_t>& init):vector<parameter_t>(Point::dim){
   if(init.size()==dim){