implementation of optimization on a subset of the parameters + debug mode in the makefile

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

1 files changed, 43 insertions, 7 deletions

diff --git a/mert/Point.cpp b/mert/Point.cpp
index 1bb6adbd8..a5f56a460 100644
--- a/mert/Point.cpp
+++ b/mert/Point.cpp
@@ -2,12 +2,23 @@
 #include<cmath>
 #include <cassert>
 using namespace std;
-void Point::randomize(const vector<lambda>& min,const vector<lambda>& max){
+
+
+vector<unsigned> Point::optindices;
+
+unsigned Point::dim=0;
+
+map<unsigned,lambda> Point::fixedweights;
+  
+unsigned Point::pdim=0;
+
+
+void Point::Randomize(const vector<lambda>& min,const vector<lambda>& max){
   for (int i=0; i<size(); i++)
     operator[](i)= min[i] + (float)random()/RAND_MAX * (max[i]-min[i]);
 }
 
-void Point::normalize(){
+void Point::Normalize(){
   lambda norm=0.0;
   for (int i=0; i<size(); i++)
     norm+= operator[](i)*operator[](i);
@@ -18,12 +29,19 @@ void Point::normalize(){
   }
 }
 
-double Point::operator*(FeatureStats& F)const{
+double Point::operator*(const FeatureStats& F)const{
   double prod=0.0;
-for (int i=0; i<size(); i++)
-    prod+= operator[](i)*F.get(i);
+  if(OptimizeAll())
+    for (unsigned i=0; i<size(); i++)
+      prod+= operator[](i)*F.get(i);
+  else{
+    for (unsigned i=0; i<size(); i++)
+      prod+= operator[](i)*F.get(optindices[i]);
+    for(map<unsigned,float >::iterator it=fixedweights.begin();it!=fixedweights.end();it++)
+      prod+=it->second*F.get(it->first);
+  }
+  return prod;
 }
-
 Point Point::operator+(const Point& p2)const{
   assert(p2.size()==size());
   Point Res(*this);
@@ -33,10 +51,28 @@ Point Point::operator+(const Point& p2)const{
   return Res;
 };
 
-Point Point::operator*(float& l)const{
+Point Point::operator*(float l)const{
   Point Res(*this);
   for(unsigned i=0;i<size();i++)
     Res[i]*=l;
   Res.score=numeric_limits<statscore>::max();
   return Res;
 };
+
+
+vector<lambda> Point::GetAllWeights()const{
+  vector<lambda> w;
+  if(OptimizeAll()){
+    w=*this;
+  }else{
+    w.resize(pdim);
+    for (int i=0; i<size(); i++)
+      w[optindices[i]]=operator[](i);
+    for(map<unsigned,float >::iterator it=fixedweights.begin();it!=fixedweights.end();it++)
+      w[it->first]=it->second;
+  }
+  return w;
+};
+
+
+