change from int to unsigned where needed

add some debugging output (to remove later)

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

1 files changed, 8 insertions, 7 deletions

diff --git a/mert/Point.h b/mert/Point.h
index e7f48d897..ac6dd6ccb 100644
--- a/mert/Point.h
+++ b/mert/Point.h
@@ -14,17 +14,17 @@ class Point:public vector<parameter_t>{
   friend class Optimizer;
  private:
   /**The indices over which we optimize*/
-  static vector<unsigned> optindices;
+  static vector<unsigned int> optindices;
   /**dimension of optindices and of the parent vector*/
-  static unsigned dim;
+  static unsigned int dim;
   /**fixed weights in case of partial optimzation*/
-  static map<unsigned,parameter_t> fixedweights;
+  static map<unsigned int,parameter_t> fixedweights;
   /**total size of the parameter space; we have pdim=FixedWeight.size()+optinidices.size()*/
-  static unsigned pdim;
-  static unsigned ncall;
+  static unsigned int pdim;
+  static unsigned int ncall;
  public:
-  static unsigned getdim(){return dim;}
-  static unsigned getpdim(){return pdim;}
+  static unsigned int getdim(){return dim;}
+  static unsigned int getpdim(){return pdim;}
   static bool OptimizeAll(){return fixedweights.empty();};
   statscore_t score;
   Point():vector<parameter_t>(dim){};
@@ -39,6 +39,7 @@ class Point:public vector<parameter_t>{
   void Normalize();
   /**return a vector of size pdim where all weights have been put(including fixed ones)*/
   vector<parameter_t> GetAllWeights()const;
+  statscore_t GetScore()const { return score; };
 };
 
 #endif