Merge pull request InsightSoftwareConsortium#5705 from N-Dekker/Use-array-constructors-with-length-and-value

Use constructors with `(length, value)` and `AllocateInitialized()`, remove `Fill(value)` calls in tests

Author: hjmjohnson

Modules/Core/Common/test/itkImageBufferRangeGTest.cxx

@@ -536,8 +536,7 @@ TEST(ImageBufferRange, SupportsVectorImage)
   image->SetRegions(imageSize);
   image->SetVectorLength(vectorLength);
   image->AllocateInitialized();
-  PixelType fillPixelValue(vectorLength);
-  fillPixelValue.Fill(42);
+  PixelType fillPixelValue(vectorLength, 42);
   image->FillBuffer(fillPixelValue);
 
   using RangeType = ImageBufferRange<ImageType>;
@@ -548,8 +547,7 @@ TEST(ImageBufferRange, SupportsVectorImage)
     EXPECT_EQ(pixelValue, fillPixelValue);
   }
 
-  PixelType otherPixelValue(vectorLength);
-  otherPixelValue.Fill(1);
+  PixelType otherPixelValue(vectorLength, 1);
   image->SetPixel({ {} }, otherPixelValue);
 
   RangeType::const_iterator it = range.begin();

Modules/Core/Common/test/itkImageRegionRangeGTest.cxx

@@ -471,8 +471,7 @@ TEST(ImageRegionRange, SupportsVectorImage)
   image->SetRegions(imageSize);
   image->SetVectorLength(vectorLength);
   image->AllocateInitialized();
-  PixelType fillPixelValue(vectorLength);
-  fillPixelValue.Fill(42);
+  PixelType fillPixelValue(vectorLength, 42);
   image->FillBuffer(fillPixelValue);
   const itk::ImageRegion<ImageDimension> region{ itk::Size<ImageDimension>::Filled(2) };
 
@@ -484,8 +483,7 @@ TEST(ImageRegionRange, SupportsVectorImage)
     EXPECT_EQ(pixelValue, fillPixelValue);
   }
 
-  PixelType otherPixelValue(vectorLength);
-  otherPixelValue.Fill(1);
+  PixelType otherPixelValue(vectorLength, 1);
   image->SetPixel({ {} }, otherPixelValue);
 
   RangeType::const_iterator it = range.begin();

Modules/Core/Common/test/itkImageVectorOptimizerParametersHelperTest.cxx

@@ -131,8 +131,7 @@ itkImageVectorOptimizerParametersHelperTest(int, char *[])
   result = testMemoryAccess(params, imageOfVectors, dimLength);
 
   // Test MoveDataPointer
-  itk::Array<ValueType> array(imageOfVectors->GetPixelContainer()->Size());
-  array.Fill(1.23);
+  itk::Array<ValueType> array(imageOfVectors->GetPixelContainer()->Size(), 1.23);
   params.MoveDataPointer(array.data_block());
 
   // Test null image pointer

Modules/Core/Common/test/itkShapedImageNeighborhoodRangeGTest.cxx

@@ -626,8 +626,7 @@ TEST(ShapedImageNeighborhoodRange, SupportsVectorImage)
   image->SetRegions(imageSize);
   image->SetVectorLength(vectorLength);
   image->AllocateInitialized();
-  PixelType fillPixelValue(vectorLength);
-  fillPixelValue.Fill(42);
+  PixelType fillPixelValue(vectorLength, 42);
   image->FillBuffer(fillPixelValue);
 
   constexpr ImageType::IndexType                            location{ 0, 1 };
@@ -643,8 +642,7 @@ TEST(ShapedImageNeighborhoodRange, SupportsVectorImage)
     EXPECT_EQ(pixelValue, fillPixelValue);
   }
 
-  PixelType otherPixelValue(vectorLength);
-  otherPixelValue.Fill(1);
+  PixelType otherPixelValue(vectorLength, 1);
   image->SetPixel({ {} }, otherPixelValue);
 
   RangeType::const_iterator it = range.begin();

Modules/Core/Common/test/itkVariableSizeMatrixTest.cxx

@@ -145,8 +145,7 @@ itkVariableSizeMatrixTest(int, char *[])
     std::cout << "d13 should not be equal to dw" << std::endl;
     return EXIT_FAILURE;
   }
-  itk::Array<float> array(3);
-  array.Fill(10.0);
+  itk::Array<float> array(3, 10.0);
 
   FloatVariableSizeMatrixType fm(5, 3);
   fm.Fill(10.0);
@@ -166,8 +165,7 @@ itkVariableSizeMatrixTest(int, char *[])
   d53.Fill(1);
   DoubleVariableSizeMatrixType d34(3, 4);
   d34.Fill(2);
-  itk::Array<double> darray(5);
-  darray.Fill(10.0);
+  itk::Array<double> darray(5, 10.0);
 
   std::cout << "***** d53" << std::endl << d53 << std::endl;
   std::cout << "***** d34" << std::endl << d34 << std::endl;

Modules/Core/ImageAdaptors/test/itkVectorImageTest.cxx

@@ -162,8 +162,7 @@ testVectorImageBasicMethods()
   image->SetNumberOfComponentsPerPixel(VectorLength);
   image->Allocate();
 
-  typename VectorImageType::PixelType f(VectorLength);
-  f.Fill(3.14f);
+  typename VectorImageType::PixelType f(VectorLength, 3.14f);
 
   image->FillBuffer(f);
 
@@ -181,8 +180,7 @@ testVectorImageBasicMethods()
 
   // test get by reference methods
 
-  typename VectorImageType::PixelType v(VectorLength);
-  v.Fill(2.22f);
+  typename VectorImageType::PixelType v(VectorLength, 2.22f);
 
   // note: this VectorImage method requires the compiler to perform return value
   // optimization to work as expected
@@ -455,8 +453,7 @@ itkVectorImageTest(int, char * argv[])
       auto                                 vectorImage = VectorImageType::New();
       VectorImageType::IndexType           start;
       itk::VariableLengthVector<PixelType> f(VectorLength);
-      itk::VariableLengthVector<PixelType> ZeroPixel(VectorLength);
-      ZeroPixel.Fill(PixelType{});
+      itk::VariableLengthVector<PixelType> ZeroPixel(VectorLength, PixelType{});
       for (unsigned int i = 0; i < VectorLength; ++i)
       {
         f[i] = i;
@@ -770,8 +767,7 @@ itkVectorImageTest(int, char * argv[])
       auto offset = itk::MakeFilled<ConstNeighborhoodIteratorType::OffsetType>(1);
       cNit -= offset;
       const itk::VariableLengthVector<PixelType> pixel = cNit.GetCenterPixel();
-      itk::VariableLengthVector<PixelType>       correctAnswer(VectorLength);
-      correctAnswer.Fill(3);
+      itk::VariableLengthVector<PixelType>       correctAnswer(VectorLength, 3);
       if (pixel != correctAnswer)
       {
         std::cerr << "  operator- [FAILED]" << std::endl;
@@ -800,8 +796,7 @@ itkVectorImageTest(int, char * argv[])
       using NeighborhoodIteratorType = itk::NeighborhoodIterator<VectorImageType>;
       NeighborhoodIteratorType nit(radius, vectorImage, region);
       nit.SetLocation(location);
-      itk::VariableLengthVector<PixelType> p(VectorLength);
-      p.Fill(100.0);
+      itk::VariableLengthVector<PixelType> p(VectorLength, 100.0);
       nit.SetNext(1, 1, p);
 
       // Test SetNext()

Modules/Core/Transform/test/itkBSplineDeformableTransformTest.cxx

@@ -97,8 +97,7 @@ itkBSplineDeformableTransformTest1()
    * Allocate memory for the parameters
    */
   const unsigned long numberOfParameters = transform->GetNumberOfParameters();
-  ParametersType      parameters(numberOfParameters);
-  parameters.Fill(ParametersType::ValueType{});
+  ParametersType      parameters(numberOfParameters, ParametersType::ValueType{});
 
   /**
    * Define N * N-D grid of spline coefficients by wrapping the
@@ -364,8 +363,7 @@ itkBSplineDeformableTransformTest1()
     bool pass = false;
     try
     {
-      ParametersType temp(transform->GetNumberOfParameters() - 1);
-      temp.Fill(4.0);
+      ParametersType temp(transform->GetNumberOfParameters() - 1, 4.0);
       transform->SetParameters(temp);
     }
     catch (const itk::ExceptionObject & err)

Modules/Core/Transform/test/itkBSplineTransformTest.cxx

@@ -127,8 +127,7 @@ itkBSplineTransformTest1()
    * Allocate memory for the parameters
    */
   const unsigned long numberOfParameters = transform->GetNumberOfParameters();
-  ParametersType      parameters(numberOfParameters);
-  parameters.Fill(ParametersType::ValueType{});
+  ParametersType      parameters(numberOfParameters, ParametersType::ValueType{});
 
   /**
    * Define N * N-D grid of spline coefficients by wrapping the
@@ -386,8 +385,7 @@ itkBSplineTransformTest1()
     bool pass = false;
     try
     {
-      ParametersType temp(transform->GetNumberOfParameters() - 1);
-      temp.Fill(4.0);
+      ParametersType temp(transform->GetNumberOfParameters() - 1, 4.0);
       transform->SetParameters(temp);
     }
     catch (const itk::ExceptionObject & err)
@@ -626,8 +624,7 @@ itkBSplineTransformTest3()
    * Allocate memory for the parameters
    */
   const unsigned long numberOfParameters = transform->GetNumberOfParameters();
-  ParametersType      parameters(numberOfParameters);
-  parameters.Fill(ParametersType::ValueType{});
+  ParametersType      parameters(numberOfParameters, ParametersType::ValueType{});
 
   /**
    * Define N * N-D grid of spline coefficients by wrapping the

Modules/Core/Transform/test/itkCenteredEuler3DTransformTest.cxx

@@ -160,8 +160,7 @@ itkCenteredEuler3DTransformTest(int, char *[])
 
   // Testing Parameters
   std::cout << "Testing Set/Get Parameters: ";
-  EulerTransformType::ParametersType parameters(9);
-  parameters.Fill(0);
+  EulerTransformType::ParametersType parameters(9, 0);
   for (unsigned int i = 0; i < 3; ++i)
   {
     parameters[i] = i;

Modules/Core/Transform/test/itkCompositeTransformTest.cxx

@@ -758,8 +758,7 @@ itkCompositeTransformTest(int, char *[])
     /* Single transform full update, of last transform only */
     compositeTransform->SetOnlyMostRecentTransformToOptimizeOn();
     CompositeType::ParametersType truth = compositeTransform->GetParameters();
-    CompositeType::DerivativeType update(compositeTransform->GetNumberOfParameters());
-    update.Fill(10);
+    CompositeType::DerivativeType update(compositeTransform->GetNumberOfParameters(), 10);
     truth += update;
     compositeTransform->UpdateTransformParameters(update);
     CompositeType::ParametersType updateResult = compositeTransform->GetParameters();
@@ -849,8 +848,7 @@ itkCompositeTransformTest(int, char *[])
   for (itk::SizeValueType n = 0; n < 12; ++n)
   {
     translationTransformVector[n] = TranslationTransformType::New();
-    TranslationTransformType::ParametersType params(VDimension);
-    params.Fill(n);
+    TranslationTransformType::ParametersType params(VDimension, n);
     translationTransformVector[n]->SetParameters(params);
   }