COMP: Round 8.

ANTsX · Nov 1, 2019 · 5fc835c · 5fc835c
1 parent a3e20a0
commit 5fc835c
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 21 deletions.
diff --git a/Examples/DeNrrd.cxx b/Examples/DeNrrd.cxx
@@ -155,10 +155,10 @@ int DeNrrd( std::vector<std::string> args, std::ostream* /*out_stream = nullptr
   gradientfile.open(output_gradients_filename);
   gradientfile << "VERSION: 2" << std::endl;
 
-  for ( int i=0; i< static_cast<int>( reader->GetOutput()->GetNumberOfComponentsPerPixel() ); i++ )
+  for ( unsigned short i=0; i < static_cast<unsigned short>( reader->GetOutput()->GetNumberOfComponentsPerPixel() ); i++ )
     {
-    char gradKey[20];
-    sprintf( gradKey, "DWMRI_gradient_%04d", i );
+    char gradKey[40];
+    sprintf( gradKey, "DWMRI_gradient_%04hu", i );
     itk::ExposeMetaData<std::string>(mdd, gradKey, v_string);
     //std::cout << "Gradient = " << v_string << std::endl;
 

diff --git a/Examples/ImageSetStatistics.cxx b/Examples/ImageSetStatistics.cxx
@@ -168,7 +168,6 @@ LocalMean(typename TImage::Pointer image, unsigned int nhood,  typename TImage::
   typedef itk::ImageRegionIteratorWithIndex<TImage> Iterator;
   Iterator outIter(image, image->GetLargestPossibleRegion() );
   typename TImage::SizeType imagesize = image->GetLargestPossibleRegion().GetSize();
-  constexpr unsigned int ImageDimension = 3;
 
   typedef itk::NeighborhoodIterator<TImage> iteratorType;
   typename iteratorType::RadiusType rad;
@@ -202,7 +201,7 @@ LocalMean(typename TImage::Pointer image, unsigned int nhood,  typename TImage::
         {
         typename TImage::IndexType index = hoodIt.GetIndex(indct);
         bool inimage = true;
-        for( itk::SizeValueType dd = 0; dd < ImageDimension; dd++ )
+        for( itk::SizeValueType dd = 0; dd < TImage::ImageDimension; dd++ )
           {
           if( index[dd] < itk::NumericTraits<typename IndexType::IndexValueType>::ZeroValue() || index[dd] > static_cast<typename IndexType::IndexValueType>( imagesize[dd] - 1) )
             {

diff --git a/Examples/antsSliceRegularizedRegistration.cxx b/Examples/antsSliceRegularizedRegistration.cxx
@@ -961,7 +961,7 @@ for ( unsigned int i = 0; i < transformList.size(); i++)
 	      VectorIOType vecout;
 	      vecout.Fill( 0 );
         typename MovingIOImageType::IndexType ind;
-        for( itk::SizeValueType xx = 0; xx < ImageDimension; xx++ )
+        for( itk::SizeValueType xx = 0; xx < MovingIOImageType::ImageDimension; xx++ )
           {
           ind[xx] = vfIter2.GetIndex()[xx];
           vecout[xx] = vec[xx];
@@ -971,7 +971,7 @@ for ( unsigned int i = 0; i < transformList.size(); i++)
           {
           tdim = timedims - 1;
           }
-        ind[ImageDimension-1] = tdim;
+        ind[MovingIOImageType::ImageDimension-1] = tdim;
         outputImage->SetPixel(ind, fval);
         displacementout->SetPixel( ind, vecout );
         }
@@ -1023,7 +1023,7 @@ for ( unsigned int i = 0; i < transformList.size(); i++)
           VectorIOType vecout;
           vecout.Fill( 0 );
           typename MovingIOImageType::IndexType ind;
-          for( itk::SizeValueType xx = 0; xx < ImageDimension; xx++ )
+          for( itk::SizeValueType xx = 0; xx < MovingIOImageType::ImageDimension; xx++ )
             {
             ind[xx] = vfIter2.GetIndex()[xx];
             vecout[xx] = vec[xx];
@@ -1033,7 +1033,7 @@ for ( unsigned int i = 0; i < transformList.size(); i++)
             {
             tdim = timedims - 1;
             }
-          ind[ImageDimension-1] = tdim;
+          ind[MovingIOImageType::ImageDimension-1] = tdim;
           displacementinv->SetPixel( ind, vecout );
           }
         }

diff --git a/ImageRegistration/itkANTSImageRegistrationOptimizer.h b/ImageRegistration/itkANTSImageRegistrationOptimizer.h
@@ -53,7 +53,7 @@
 namespace itk
 {
 template <unsigned int TDimension = 3, typename TReal = float>
-class ANTSImageRegistrationOptimizer
+class ANTSImageRegistrationOptimizer final
   : public       Object
 {
 public:

diff --git a/ImageRegistration/itkPICSLAdvancedNormalizationToolKit.h b/ImageRegistration/itkPICSLAdvancedNormalizationToolKit.h
@@ -28,7 +28,7 @@
 namespace itk
 {
 template <unsigned int TDimension = 3, typename TReal = float>
-class PICSLAdvancedNormalizationToolKit
+class PICSLAdvancedNormalizationToolKit final
   : public       Object
 {
 public:

diff --git a/ImageRegistration/itkProbabilisticRegistrationFunction.h b/ImageRegistration/itkProbabilisticRegistrationFunction.h
@@ -51,7 +51,7 @@ namespace itk
  * \ingroup FiniteDifferenceFunctions
  */
 template <typename TFixedImage, typename TMovingImage, typename TDisplacementField>
-class ProbabilisticRegistrationFunction :
+class ProbabilisticRegistrationFunction final :
   public         AvantsPDEDeformableRegistrationFunction<TFixedImage,
                                                          TMovingImage, TDisplacementField>
 {

diff --git a/ImageRegistration/itkSpatialMutualInformationRegistrationFunction.h b/ImageRegistration/itkSpatialMutualInformationRegistrationFunction.h
@@ -115,7 +115,7 @@ namespace itk
  * \ingroup ThreadUnSafe
  */
 template <typename TFixedImage, typename TMovingImage, typename TDisplacementField>
-class SpatialMutualInformationRegistrationFunction :
+class SpatialMutualInformationRegistrationFunction final :
   public         AvantsPDEDeformableRegistrationFunction<TFixedImage, TMovingImage, TDisplacementField>
 {
 public:

diff --git a/ImageRegistration/itkSyNDemonsRegistrationFunction.h b/ImageRegistration/itkSyNDemonsRegistrationFunction.h
@@ -47,7 +47,7 @@ namespace itk
 * \ingroup FiniteDifferenceFunctions
 */
 template <typename TFixedImage, typename TMovingImage, typename TDisplacementField>
-class SyNDemonsRegistrationFunction :
+class SyNDemonsRegistrationFunction final :
   public         AvantsPDEDeformableRegistrationFunction<TFixedImage,
                                                          TMovingImage,
                                                          TDisplacementField>

diff --git a/ImageSegmentation/antsAtroposSegmentationImageFilter.h b/ImageSegmentation/antsAtroposSegmentationImageFilter.h
@@ -252,7 +252,7 @@ class AtroposSegmentationImageFilter final :
    * cause a greater spatial homogeneity in the final labeling.  Default value
    * = 0.3.
    */
-  itkSetClampMacro( MRFSmoothingFactor, RealType, 0.0, NumericTraits<RealType>::max() );
+  itkSetClampMacro( MRFSmoothingFactor, RealType,  NumericTraits<RealType>::ZeroValue(), NumericTraits<RealType>::max() );
 
   /**
    * Get the MRF smoothing parameter.
@@ -289,7 +289,7 @@ class AtroposSegmentationImageFilter final :
    * (likelihoods * priors)^(1/T) where T is specified annealing temperature
    * raised to the number of elapsed iterations.  Default value = 1.0.
    */
-  itkSetClampMacro( InitialAnnealingTemperature, RealType, 0.0, NumericTraits<RealType>::max() );
+  itkSetClampMacro( InitialAnnealingTemperature, RealType,  NumericTraits<RealType>::ZeroValue(), NumericTraits<RealType>::max() );
 
   /**
    * Get the initial annealing temperature.  For values
@@ -305,8 +305,8 @@ class AtroposSegmentationImageFilter final :
    * Typically, the algorithm becomes unstable for values < 0.1.  Default value
    * = 0.1.
    */
-  itkSetClampMacro( MinimumAnnealingTemperature, RealType, 0.0,
-                    NumericTraits<RealType>::max() );
+  itkSetClampMacro( MinimumAnnealingTemperature, RealType,
+    NumericTraits<RealType>::ZeroValue(), NumericTraits<RealType>::max() );
 
   /**
    * Get the minimum annealing temperature for ICM asynchronous updating.
@@ -322,7 +322,8 @@ class AtroposSegmentationImageFilter final :
    * (likelihoods * priors)^(1/T) where T is specified annealing temperature
    * raised to the number of elapsed iterations. Default value = 1.0.
    */
-  itkSetClampMacro( AnnealingRate, RealType, 0.0, 1.0 );
+  itkSetClampMacro( AnnealingRate, RealType,
+    NumericTraits<RealType>::ZeroValue(), NumericTraits<RealType>::OneValue() );
 
   /**
    * Set the annealing rate for ICM asynchronous updating.  For values
@@ -421,7 +422,8 @@ class AtroposSegmentationImageFilter final :
    * values are included in the sparse representation of the prior probability
    * images.  Default value =
    */
-  itkSetClampMacro( ProbabilityThreshold, RealType, 0.0, 1.0 );
+  itkSetClampMacro( ProbabilityThreshold, RealType,
+    NumericTraits<RealType>::ZeroValue(), NumericTraits<RealType>::OneValue() );
 
   /**
    * Get the prior probability threshold value.
@@ -528,7 +530,7 @@ class AtroposSegmentationImageFilter final :
    * prior probability information should be included in the posterior
    * probability information.
    */
-  itkSetClampMacro( PriorProbabilityWeight, RealType, 0.0, 1.e9 );
+  itkSetClampMacro( PriorProbabilityWeight, RealType,  NumericTraits<RealType>::ZeroValue(), static_cast<RealType>( 1.e9 ) );
 
   /**
    * Get the prior probability weight.