Skip to content

Commit

Permalink
Fix Floor(), Ceil(), and Round() functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@onurulgen
onurulgen committed Aug 27, 2024
1 parent 7e1e926 commit a148f14
Show file tree
Hide file tree
Showing 23 changed files with 214 additions and 214 deletions.
2 changes: 1 addition & 1 deletion niftyreg_build_version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
434
435
2 changes: 1 addition & 1 deletion reg-apps/reg_aladin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ int main(int argc, char **argv) {

time_t end;
time(&end);
const int minutes = Floor((end - start) / 60.0f);
const int minutes = Floor<int>((end - start) / 60.0f);
const int seconds = static_cast<int>(end - start) - 60 * minutes;
NR_VERBOSE_APP("Registration performed in " << minutes << " min " << seconds << " sec");
NR_VERBOSE_APP("Have a good day!");
Expand Down
60 changes: 30 additions & 30 deletions reg-apps/reg_benchmark.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ int main(int argc, char **argv)

// A control point image is created
dim_img[0]=5;
dim_img[1]=Floor(targetImage->nx*targetImage->dx/gridSpacing)+4;
dim_img[2]=Floor(targetImage->ny*targetImage->dy/gridSpacing)+4;
dim_img[3]=Floor(targetImage->nz*targetImage->dz/gridSpacing)+4;
dim_img[1]=Floor<int>(targetImage->nx*targetImage->dx/gridSpacing)+4;
dim_img[2]=Floor<int>(targetImage->ny*targetImage->dy/gridSpacing)+4;
dim_img[3]=Floor<int>(targetImage->nz*targetImage->dz/gridSpacing)+4;
dim_img[5]=3;
dim_img[4]=dim_img[6]=dim_img[7]=1;
nifti_image *controlPointImage = nifti_make_new_nim(dim_img, NIFTI_TYPE_FLOAT32, true);
Expand Down Expand Up @@ -245,7 +245,7 @@ int main(int argc, char **argv)
}
time(&end);
cpuTime=(end-start);
minutes = Floor(float(cpuTime)/60.0f);
minutes = Floor<int>(float(cpuTime)/60.0f);
seconds = (int)(cpuTime - 60*minutes);
printf( "CPU - %i affine deformation field computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "CPU - %i affine deformation field computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand All @@ -261,7 +261,7 @@ int main(int argc, char **argv)
}
time(&end);
gpuTime=(end-start);
minutes = Floor(float(gpuTime)/60.0f);
minutes = Floor<int>(float(gpuTime)/60.0f);
seconds = (int)(gpuTime - 60*minutes);
printf("GPU - %i affine deformation field computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "GPU - %i affine deformation field computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand Down Expand Up @@ -295,7 +295,7 @@ int main(int argc, char **argv)
}
time(&end);
cpuTime=(end-start);
minutes = Floor(float(cpuTime)/60.0f);
minutes = Floor<int>(float(cpuTime)/60.0f);
seconds = (int)(cpuTime - 60*minutes);
printf("CPU - %i spline deformation field computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "CPU - %i spline deformation field computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand All @@ -314,7 +314,7 @@ int main(int argc, char **argv)
}
time(&end);
gpuTime=(end-start);
minutes = Floor(float(gpuTime)/60.0f);
minutes = Floor<int>(float(gpuTime)/60.0f);
seconds = (int)(gpuTime - 60*minutes);
printf("GPU - %i spline deformation field computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "GPU - %i spline deformation field computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand Down Expand Up @@ -345,7 +345,7 @@ int main(int argc, char **argv)
}
time(&end);
cpuTime=(end-start);
minutes = Floor(float(cpuTime)/60.0f);
minutes = Floor<int>(float(cpuTime)/60.0f);
seconds = (int)(cpuTime - 60*minutes);
printf("CPU - %i scaling-and-squaring - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "CPU - %i scaling-and-squarings - %i min %i sec\n", maxIt, minutes, seconds);
Expand All @@ -362,7 +362,7 @@ int main(int argc, char **argv)
}
time(&end);
gpuTime=(end-start);
minutes = Floor(float(gpuTime)/60.0f);
minutes = Floor<int>(float(gpuTime)/60.0f);
seconds = (int)(gpuTime - 60*minutes);
printf("GPU - %i scaling-and-squaring - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "GPU - %i scaling-and-squarings - %i min %i sec\n", maxIt, minutes, seconds);
Expand Down Expand Up @@ -395,7 +395,7 @@ int main(int argc, char **argv)
}
time(&end);
cpuTime=(end-start);
minutes = Floor(float(cpuTime)/60.0f);
minutes = Floor<int>(float(cpuTime)/60.0f);
seconds = (int)(cpuTime - 60*minutes);
printf("CPU - %i linear interpolation computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "CPU - %i linear interpolation computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand All @@ -416,7 +416,7 @@ int main(int argc, char **argv)
}
time(&end);
gpuTime=(end-start);
minutes = Floor(float(gpuTime)/60.0f);
minutes = Floor<int>(float(gpuTime)/60.0f);
seconds = (int)(gpuTime - 60*minutes);
printf("GPU - %i linear interpolation computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "GPU - %i linear interpolation computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand Down Expand Up @@ -447,7 +447,7 @@ int main(int argc, char **argv)
}
time(&end);
cpuTime=(end-start);
minutes = Floor(float(cpuTime)/60.0f);
minutes = Floor<int>(float(cpuTime)/60.0f);
seconds = (int)(cpuTime - 60*minutes);
printf("CPU - %i spatial gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "CPU - %i spatial gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand All @@ -466,7 +466,7 @@ int main(int argc, char **argv)
}
time(&end);
gpuTime=(end-start);
minutes = Floor(float(gpuTime)/60.0f);
minutes = Floor<int>(float(gpuTime)/60.0f);
seconds = (int)(gpuTime - 60*minutes);
printf("GPU - %i spatial gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "GPU - %i spatial gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand Down Expand Up @@ -525,7 +525,7 @@ int main(int argc, char **argv)
}
time(&end);
cpuTime=(end-start);
minutes = Floor(float(cpuTime)/60.0f);
minutes = Floor<int>(float(cpuTime)/60.0f);
seconds = (int)(cpuTime - 60*minutes);
printf("CPU - %i voxel-based NMI gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "CPU - %i voxel-based NMI gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand Down Expand Up @@ -558,7 +558,7 @@ int main(int argc, char **argv)
}
time(&end);
gpuTime=(end-start);
minutes = Floor(float(gpuTime)/60.0f);
minutes = Floor<int>(float(gpuTime)/60.0f);
seconds = (int)(gpuTime - 60*minutes);
printf("GPU - %i voxel-based NMI gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "GPU - %i voxel-based NMI gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand Down Expand Up @@ -588,9 +588,9 @@ int main(int argc, char **argv)
maxIt=10000 / dimension;
// maxIt=1;
int smoothingRadius[3];
smoothingRadius[0] = Floor( 2.0*controlPointImage->dx/targetImage->dx );
smoothingRadius[1] = Floor( 2.0*controlPointImage->dy/targetImage->dy );
smoothingRadius[2] = Floor( 2.0*controlPointImage->dz/targetImage->dz );
smoothingRadius[0] = Floor<int>( 2.0*controlPointImage->dx/targetImage->dx );
smoothingRadius[1] = Floor<int>( 2.0*controlPointImage->dy/targetImage->dy );
smoothingRadius[2] = Floor<int>( 2.0*controlPointImage->dz/targetImage->dz );
time(&start);
for(int i=0; i<maxIt; ++i)
{
Expand All @@ -599,7 +599,7 @@ int main(int argc, char **argv)
}
time(&end);
cpuTime=(end-start);
minutes = Floor(float(cpuTime)/60.0f);
minutes = Floor<int>(float(cpuTime)/60.0f);
seconds = (int)(cpuTime - 60*minutes);
printf("CPU - %i node-based NMI gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "CPU - %i node-based NMI gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand All @@ -620,7 +620,7 @@ int main(int argc, char **argv)
}
time(&end);
gpuTime=(end-start);
minutes = Floor(float(gpuTime)/60.0f);
minutes = Floor<int>(float(gpuTime)/60.0f);
seconds = (int)(gpuTime - 60*minutes);
printf("GPU - %i node-based NMI gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "GPU - %i node-based NMI gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand Down Expand Up @@ -650,7 +650,7 @@ int main(int argc, char **argv)
}
time(&end);
cpuTime=(end-start);
minutes = Floor(float(cpuTime)/60.0f);
minutes = Floor<int>(float(cpuTime)/60.0f);
seconds = (int)(cpuTime - 60*minutes);
printf("CPU - %i BE computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "CPU - %i BE computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand All @@ -665,7 +665,7 @@ int main(int argc, char **argv)
}
time(&end);
gpuTime=(end-start);
minutes = Floor(float(gpuTime)/60.0f);
minutes = Floor<int>(float(gpuTime)/60.0f);
seconds = (int)(gpuTime - 60*minutes);
printf("GPU - %i BE computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "GPU - %i BE computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand All @@ -690,7 +690,7 @@ int main(int argc, char **argv)
}
time(&end);
cpuTime=(end-start);
minutes = Floor(float(cpuTime)/60.0f);
minutes = Floor<int>(float(cpuTime)/60.0f);
seconds = (int)(cpuTime - 60*minutes);
printf("CPU - %i BE gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "CPU - %i BE gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand All @@ -708,7 +708,7 @@ int main(int argc, char **argv)
}
time(&end);
gpuTime=(end-start);
minutes = Floor(float(gpuTime)/60.0f);
minutes = Floor<int>(float(gpuTime)/60.0f);
seconds = (int)(gpuTime - 60*minutes);
printf("GPU - %i BE gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "GPU - %i BE gradient computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand All @@ -729,7 +729,7 @@ int main(int argc, char **argv)
}
time(&end);
cpuTime=(end-start);
minutes = Floor(float(cpuTime)/60.0f);
minutes = Floor<int>(float(cpuTime)/60.0f);
seconds = (int)(cpuTime - 60*minutes);
printf("CPU - %i |Jac| penalty term computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "CPU - %i |Jac| penalty term computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand All @@ -743,7 +743,7 @@ int main(int argc, char **argv)
}
time(&end);
gpuTime=(end-start);
minutes = Floor(float(gpuTime)/60.0f);
minutes = Floor<int>(float(gpuTime)/60.0f);
seconds = (int)(gpuTime - 60*minutes);
printf("GPU - %i |Jac| penalty term computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "GPU - %i |Jac| penalty term computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand All @@ -764,7 +764,7 @@ int main(int argc, char **argv)
}
time(&end);
cpuTime=(end-start);
minutes = Floor(float(cpuTime)/60.0f);
minutes = Floor<int>(float(cpuTime)/60.0f);
seconds = (int)(cpuTime - 60*minutes);
printf("CPU - %i Approx. |Jac| penalty term computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "CPU - %i Approx. |Jac| penalty term computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand All @@ -778,7 +778,7 @@ int main(int argc, char **argv)
}
time(&end);
gpuTime=(end-start);
minutes = Floor(float(gpuTime)/60.0f);
minutes = Floor<int>(float(gpuTime)/60.0f);
seconds = (int)(gpuTime - 60*minutes);
printf("GPU - %i Approx. |Jac| penalty term computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "GPU - %i Approx. |Jac| penalty term computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand Down Expand Up @@ -831,7 +831,7 @@ int main(int argc, char **argv)
}
time(&end);
cpuTime=(end-start);
minutes = Floor(float(cpuTime)/60.0f);
minutes = Floor<int>(float(cpuTime)/60.0f);
seconds = (int)(cpuTime - 60*minutes);
printf("CPU - %i block matching computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "CPU - %i block matching computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand All @@ -852,7 +852,7 @@ int main(int argc, char **argv)
}
time(&end);
gpuTime=(end-start);
minutes = Floor(float(gpuTime)/60.0f);
minutes = Floor<int>(float(gpuTime)/60.0f);
seconds = (int)(gpuTime - 60*minutes);
printf("GPU - %i block matching computations - %i min %i sec\n", maxIt, minutes, seconds);
fprintf(outputFile, "GPU - %i block matching computations - %i min %i sec\n", maxIt, minutes, seconds);
Expand Down
2 changes: 1 addition & 1 deletion reg-apps/reg_f3d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ int main(int argc, char **argv) {

time_t end;
time(&end);
const int minutes = Floor((end - start) / 60.0f);
const int minutes = Floor<int>((end - start) / 60.0f);
const int seconds = static_cast<int>(end - start) - 60 * minutes;
NR_VERBOSE_APP("Registration performed in " << minutes << " min " << seconds << " sec");
NR_VERBOSE_APP("Have a good day!");
Expand Down
2 changes: 1 addition & 1 deletion reg-apps/reg_ppcnr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ int main(int argc, char **argv)

time_t end;
time( &end );
int minutes = Floor(float(end-start)/60.0f);
int minutes = Floor<int>(float(end-start)/60.0f);
int seconds = (int)(end-start - 60*minutes);
NR_COUT << "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n";
if(flag->locality)
Expand Down
2 changes: 1 addition & 1 deletion reg-apps/reg_resample.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ int main(int argc, char **argv)
param->interpolation,
param->paddingValue,
jacobian,
(char)Round(param->PSF_Algorithm));
Round<char>(param->PSF_Algorithm));
NR_DEBUG("PSF resampling completed");
free(jacobian);
}
Expand Down
16 changes: 8 additions & 8 deletions reg-apps/reg_tools.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,8 +499,8 @@ int main(int argc, char **argv)
reg_tools_changeDatatype<float>(image);
nifti_image *normImage = nifti_dup(*image);
HeapSort(static_cast<float *>(normImage->data), normImage->nvox);
float minValue = static_cast<float *>(normImage->data)[Floor(03*(int)normImage->nvox/100)];
float maxValue = static_cast<float *>(normImage->data)[Floor(97*(int)normImage->nvox/100)];
float minValue = static_cast<float *>(normImage->data)[Floor<size_t>(0.03*normImage->nvox)];
float maxValue = static_cast<float *>(normImage->data)[Floor<size_t>(0.97*normImage->nvox)];
reg_tools_subtractValueFromImage(image,normImage,minValue);
reg_tools_divideValueToImage(normImage,normImage,maxValue-minValue);
if(flag->outputImageFlag)
Expand Down Expand Up @@ -803,10 +803,10 @@ int main(int argc, char **argv)
// Define the size of the new image
int newDim[8];
for(size_t i=0; i<8; ++i) newDim[i]=image->dim[i];
newDim[1]=Ceil((float)image->dim[1]*image->pixdim[1]/param->pixdimX);
newDim[2]=Ceil((float)image->dim[2]*image->pixdim[2]/param->pixdimY);
newDim[1]=Ceil<int>((float)image->dim[1]*image->pixdim[1]/param->pixdimX);
newDim[2]=Ceil<int>((float)image->dim[2]*image->pixdim[2]/param->pixdimY);
if(image->nz>1)
newDim[3]=Ceil((float)image->dim[3]*image->pixdim[3]/param->pixdimZ);
newDim[3]=Ceil<int>((float)image->dim[3]*image->pixdim[3]/param->pixdimZ);
// Create the new image
nifti_image *newImg=nifti_make_new_nim(newDim,image->datatype,true);
newImg->pixdim[1]=newImg->dx=param->pixdimX;
Expand Down Expand Up @@ -954,7 +954,7 @@ int main(int argc, char **argv)
for(int y=0; y<image->ny; ++y){
for(int x=0; x<image->nx; ++x){
size_t outIndex = ((z*image->ny+y)*image->nx+x)*image->nt*image->nu+t;
outPtr[outIndex] = Round(*inPtr);
outPtr[outIndex] = Round<unsigned char>(*inPtr);
++inPtr;
}
}
Expand Down Expand Up @@ -997,8 +997,8 @@ int main(int argc, char **argv)
float value = *inPtr * 255.f;
size_t outIndex = ((z*image->ny+y)*image->nx+x)*3;
if (value > 0)
outPtr[outIndex] = static_cast<unsigned char>(Round(value>255?255:value));
else outPtr[outIndex+1] = static_cast<unsigned char>(Round(-value<-255?-255:-value));
outPtr[outIndex] = Round<unsigned char>(value > 255 ? 255 : value);
else outPtr[outIndex + 1] = Round<unsigned char>(-value < -255 ? -255 : -value);
outPtr[outIndex+2] = 0;
++inPtr;
}
Expand Down
Loading

0 comments on commit a148f14

Please sign in to comment.