Merge pull request InsightSoftwareConsortium#4674 from andrei-sandor/…

…WunreachableCode COMP: Fix ununsed code ( if(false) )
Kitware · May 31, 2024 · 970908c · 970908c
2 parents 43810c6 + ba12c7d
commit 970908c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/...tration/Metricsv4/test/itkJointHistogramMutualInformationImageToImageRegistrationTest.cxx b/...tration/Metricsv4/test/itkJointHistogramMutualInformationImageToImageRegistrationTest.cxx
@@ -156,6 +156,7 @@ itkJointHistogramMutualInformationImageToImageRegistrationTest(int argc, char *
   std::cout << argc << std::endl;
   unsigned int numberOfIterations = 10;
   unsigned int numberOfDisplacementIterations = 10;
+  bool         useScalesEstimator = true;
   if (argc >= 5)
   {
     numberOfIterations = std::stoi(argv[4]);
@@ -164,6 +165,10 @@ itkJointHistogramMutualInformationImageToImageRegistrationTest(int argc, char *
   {
     numberOfDisplacementIterations = std::stoi(argv[5]);
   }
+  if (argc >= 7)
+  {
+    useScalesEstimator = std::stoi(argv[6]);
+  }
   std::cout << " iterations " << numberOfIterations << " displacementIterations " << numberOfDisplacementIterations
             << std::endl;
 
@@ -313,7 +318,7 @@ itkJointHistogramMutualInformationImageToImageRegistrationTest(int argc, char *
   RegistrationParameterScalesFromShiftType::ScalesType displacementScales(
     displacementTransform->GetNumberOfLocalParameters());
   displacementScales.Fill(1);
-  if (false)
+  if (!useScalesEstimator)
   {
     optimizer->SetScales(displacementScales);
   }

diff --git a/Modules/Registration/Metricsv4/test/itkMeanSquaresImageToImageMetricv4RegistrationTest.cxx b/Modules/Registration/Metricsv4/test/itkMeanSquaresImageToImageMetricv4RegistrationTest.cxx
@@ -57,6 +57,7 @@ itkMeanSquaresImageToImageMetricv4RegistrationTest(int argc, char * argv[])
   std::cout << argc << std::endl;
   unsigned int numberOfIterations = 2;
   unsigned int numberOfDisplacementIterations = 2;
+  bool         useScalesEstimator = true;
   if (argc >= 5)
   {
     numberOfIterations = std::stoi(argv[4]);
@@ -65,6 +66,10 @@ itkMeanSquaresImageToImageMetricv4RegistrationTest(int argc, char * argv[])
   {
     numberOfDisplacementIterations = std::stoi(argv[5]);
   }
+  if (argc >= 7)
+  {
+    useScalesEstimator = std::stoi(argv[6]);
+  }
   std::cout << " iterations " << numberOfIterations << " displacementIterations " << numberOfDisplacementIterations
             << std::endl;
 
@@ -204,14 +209,15 @@ itkMeanSquaresImageToImageMetricv4RegistrationTest(int argc, char * argv[])
   RegistrationParameterScalesFromShiftType::ScalesType displacementScales(
     displacementTransform->GetNumberOfLocalParameters());
   displacementScales.Fill(1);
-  if (false)
+  if (!useScalesEstimator)
   {
     optimizer->SetScales(displacementScales);
   }
   else
   {
     optimizer->SetScalesEstimator(shiftScaleEstimator);
   }
+
   optimizer->SetMetric(metric);
   optimizer->SetNumberOfIterations(numberOfDisplacementIterations);
   try

diff --git a/.../Registration/Metricsv4/test/itkMeanSquaresImageToImageMetricv4VectorRegistrationTest.cxx b/.../Registration/Metricsv4/test/itkMeanSquaresImageToImageMetricv4VectorRegistrationTest.cxx
@@ -59,6 +59,7 @@ itkMeanSquaresImageToImageMetricv4VectorRegistrationTest(int argc, char * argv[]
   std::cout << argc << std::endl;
   unsigned int numberOfAffineIterations = 2;
   unsigned int numberOfDisplacementIterations = 2;
+  bool         useScalesEstimator = true;
   if (argc >= 5)
   {
     numberOfAffineIterations = std::stoi(argv[4]);
@@ -67,6 +68,10 @@ itkMeanSquaresImageToImageMetricv4VectorRegistrationTest(int argc, char * argv[]
   {
     numberOfDisplacementIterations = std::stoi(argv[5]);
   }
+  if (argc >= 7)
+  {
+    useScalesEstimator = std::stoi(argv[6]);
+  }
   std::cout << " affine iterations " << numberOfAffineIterations << " displacementIterations "
             << numberOfDisplacementIterations << std::endl;
 
@@ -218,14 +223,16 @@ itkMeanSquaresImageToImageMetricv4VectorRegistrationTest(int argc, char * argv[]
   RegistrationParameterScalesFromShiftType::ScalesType displacementScales(
     displacementTransform->GetNumberOfLocalParameters());
   displacementScales.Fill(1);
-  if (false)
+
+  if (!useScalesEstimator)
   {
     optimizer->SetScales(displacementScales);
   }
   else
   {
     optimizer->SetScalesEstimator(shiftScaleEstimator);
   }
+
   optimizer->SetMetric(metric);
   optimizer->SetNumberOfIterations(numberOfDisplacementIterations);
   try

diff --git a/Modules/Registration/Metricsv4/test/itkMultiGradientImageToImageMetricv4RegistrationTest.cxx b/Modules/Registration/Metricsv4/test/itkMultiGradientImageToImageMetricv4RegistrationTest.cxx
@@ -57,10 +57,15 @@ itkMultiGradientImageToImageMetricv4RegistrationTest(int argc, char * argv[])
 
   std::cout << argc << std::endl;
   unsigned int numberOfIterations = 10;
+  bool         useSubSampling = true;
   if (argc >= 5)
   {
     numberOfIterations = std::stoi(argv[4]);
   }
+  if (argc >= 6)
+  {
+    useSubSampling = std::stoi(argv[5]);
+  }
   std::cout << " iterations " << numberOfIterations << std::endl;
 
   constexpr unsigned int Dimension = 2;
@@ -113,7 +118,7 @@ itkMultiGradientImageToImageMetricv4RegistrationTest(int argc, char * argv[])
   metric->SetNumberOfHistogramBins(20);
   auto metric2 = MetricType2::New();
 
-  if (false)
+  if (!useSubSampling)
   {
     std::cout << "Dense sampling." << std::endl;
     metric->SetUseSampledPointSet(false);
@@ -142,7 +147,6 @@ itkMultiGradientImageToImageMetricv4RegistrationTest(int argc, char * argv[])
     metric2->SetUseSampledPointSet(true);
     std::cout << "Testing metric with point set..." << std::endl;
   }
-
   metric->SetFixedImage(fixedImage);
   metric->SetMovingImage(movingImage);
   metric->SetFixedTransform(identityTransform);