fixed expected cells

Author: calderonil

sbf.cpp

@@ -297,7 +297,7 @@ void SBF::PrintFilter(int mode)
     printf("Area-related parameters:\n");
     for(int j = 1; j < this->AREA_number+1; j++){
         potential_elements = (this->AREA_members[j]*this->HASH_number)-this->AREA_self_collisions[j];
-        printf("Area %d: %d members, %.5f expected cells, %d cells out of %d potential (%d self-collisions)",j,this->AREA_members[j],this->AREA_expected_cells[j],this->AREA_cells[j],potential_elements,this->AREA_self_collisions[j]);
+        printf("Area %d: %d members, %d expected cells, %d cells out of %d potential (%d self-collisions)",j,this->AREA_members[j],this->AREA_expected_cells[j],this->AREA_cells[j],potential_elements,this->AREA_self_collisions[j]);
         printf("\n");
     }
 
@@ -560,9 +560,9 @@ void SBF::SetExpectedAreaCells()
 		p2 = (double)pow(p1, this->HASH_number*nfill);
 		p1 = (double)(1 - (double)pow(p1, this->HASH_number*this->AREA_members[i]));
 
-		p1 = (double)this->cells*p1*p2;
+		p1 = (double)(this->cells*p1*p2);
 
-		this->AREA_expected_cells[i] = (float)p1;
+		this->AREA_expected_cells[i] = (int)round(p1);
 
 	}
 }

sbf.h

@@ -69,7 +69,7 @@ namespace sbf {
 		float safeness;
 		int AREA_number;
 		int *AREA_members;
-		float *AREA_expected_cells;
+		int *AREA_expected_cells;
 		int *AREA_cells;
 		int *AREA_self_collisions;
 		float *AREA_a_priori_fpp;
@@ -180,7 +180,7 @@ namespace sbf {
 			// Memory allocations for area related parameters
 			this->AREA_members = new int[this->AREA_number + 1];
 			this->AREA_cells = new int[this->AREA_number + 1];
-			this->AREA_expected_cells = new float[this->AREA_number + 1];
+			this->AREA_expected_cells = new int[this->AREA_number + 1];
 			this->AREA_self_collisions = new int[this->AREA_number + 1];
 			this->AREA_fpp = new float[this->AREA_number + 1];
 			this->AREA_isep = new float[this->AREA_number + 1];