numb improvements

Author: kosloot

src/Features.cxx

@@ -272,7 +272,6 @@ namespace Timbl {
   void Feature::NumStatistics( vector<FeatureValue *>& FVBin,
 			       double DBentropy ){
     size_t BinSize = FVBin.size();
-    double Prob, FVEntropy;
     size_t TotalVals = TotalValues();
     entropy = 0.0;
     vector<D_D*> ddv;
@@ -311,9 +310,9 @@ namespace Timbl {
       if ( Freq > 0 ){
 	// Entropy for this FV pair.
 	//
-	FVEntropy = 0.0;
+	auto FVEntropy = 0.0;
 	for ( const auto& it : pnt->TargetDist ){
-	  Prob = it.second->Freq()/(double)Freq;
+	  auto Prob = it.second->Freq()/(double)Freq;
 	  FVEntropy += Prob * Log2(Prob);
 	}
 	entropy += -FVEntropy * Freq / (double)TotalVals;
@@ -330,7 +329,7 @@ namespace Timbl {
     for ( size_t l=0; l < BinSize; ++l ){
       size_t Freq = FVBin[l]->ValFreq();
       if ( Freq > 0 ){
-	Prob = Freq / (double)TotalVals;
+	auto Prob = Freq / (double)TotalVals;
 	split_info += Prob * Log2(Prob);
       }
     }

src/GetOptClass.cxx

@@ -446,7 +446,6 @@ namespace Timbl {
   inline bool GetOptClass::parse_range( string& line,
 					string::iterator& it,
 					MetricType Value ){
-    size_t m;
     while( it != line.end() && *it != ':' ){
       auto eit = it;
       while( eit != line.end() && isdigit( *eit ) ) ++eit;
@@ -476,7 +475,7 @@ namespace Timbl {
 	eit = it;
 	while( eit != line.end() && isdigit( *eit ) ) ++eit;
 	tmp = string( it, eit );
-	m = TiCC::stringTo<int>(tmp);
+	size_t m = TiCC::stringTo<int>(tmp);
 	if ( m == 0 || m > metricsArray.size() ){
 	  Error( "illegal value in metric description: -m " + line );
 	  return false;

src/IBtree.cxx

@@ -962,12 +962,11 @@ namespace Timbl {
 				      unsigned long& cnt ){
     // remove branches with the same target as the Top, except when they
     // still have a subbranch, which means that they are an exception.
-    IBtree **tmp, *dead, *result;
-    result = this;
-    tmp = &result;
+    IBtree *result = this;
+    IBtree **tmp = &result;
     while ( *tmp ){
       if ( (*tmp)->TValue == Top && (*tmp)->link == NULL ){
-	dead = *tmp;
+	IBtree *dead = *tmp;
 	*tmp = (*tmp)->next;
 	dead->next=NULL;
 	--cnt;