STYLE: Replace if (x > f()) x = f() with x = std::min(x, f())

Simplified the code by using `std::min`. Using Notepad++, Replace in Files: Find what: ([ ]+)if \(([^ ]+) > ([^ ]+\))\)\r\n\1{\r\n\1 \2 = \3;\r\n\1} Replace with: \1\2 = std::min\(\2, \3\); Filters: itk*.hxx;itk*.h;itk*.cxx [v] Match case (*) Regular expression Manually added the necessary template argument to the `std::min` call in `IntensityWindowingImageFilter`, because it could not be deduced automatically.
InsightSoftwareConsortium · Feb 21, 2024 · 1b9fc82 · 1b9fc82
1 parent 755cd10
commit 1b9fc82
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 32 deletions.
diff --git a/Modules/Core/Common/src/itkPlatformMultiThreaderPosix.cxx b/Modules/Core/Common/src/itkPlatformMultiThreaderPosix.cxx
@@ -30,6 +30,7 @@
 #include "itkObjectFactory.h"
 #include "itksys/SystemTools.hxx"
 #include <unistd.h>
+#include <algorithm> // For min.
 
 namespace itk
 {
@@ -46,10 +47,7 @@ PlatformMultiThreader::MultipleMethodExecute()
   pthread_t process_id[ITK_MAX_THREADS];
 
   // obey the global maximum number of threads limit
-  if (m_NumberOfWorkUnits > MultiThreaderBase::GetGlobalMaximumNumberOfThreads())
-  {
-    m_NumberOfWorkUnits = MultiThreaderBase::GetGlobalMaximumNumberOfThreads();
-  }
+  m_NumberOfWorkUnits = std::min(m_NumberOfWorkUnits, MultiThreaderBase::GetGlobalMaximumNumberOfThreads());
   for (ThreadIdType thread_loop = 0; thread_loop < m_NumberOfWorkUnits; ++thread_loop)
   {
     if (m_MultipleMethod[thread_loop] == (ThreadFunctionType) nullptr)

diff --git a/Modules/Core/Common/src/itkPlatformMultiThreaderSingle.cxx b/Modules/Core/Common/src/itkPlatformMultiThreaderSingle.cxx
@@ -29,6 +29,7 @@
 #include "itkObjectFactory.h"
 #include "itksys/SystemTools.hxx"
 #include <cstdlib>
+#include <algorithm> // For min.
 
 namespace itk
 {
@@ -39,10 +40,7 @@ PlatformMultiThreader::MultipleMethodExecute()
   ThreadIdType thread_loop;
 
   // obey the global maximum number of threads limit
-  if (m_NumberOfWorkUnits > MultiThreaderBase::GetGlobalMaximumNumberOfThreads())
-  {
-    m_NumberOfWorkUnits = MultiThreaderBase::GetGlobalMaximumNumberOfThreads();
-  }
+  m_NumberOfWorkUnits = std::min(m_NumberOfWorkUnits, MultiThreaderBase::GetGlobalMaximumNumberOfThreads());
 
   for (thread_loop = 0; thread_loop < m_NumberOfWorkUnits; ++thread_loop)
   {

diff --git a/Modules/Core/Common/src/itkPlatformMultiThreaderWindows.cxx b/Modules/Core/Common/src/itkPlatformMultiThreaderWindows.cxx
@@ -32,6 +32,7 @@
 
 #include "itkWindows.h"
 #include <process.h>
+#include <algorithm> // For min.
 
 namespace itk
 {
@@ -44,10 +45,7 @@ PlatformMultiThreader::MultipleMethodExecute()
   HANDLE processId[ITK_MAX_THREADS];
 
   // obey the global maximum number of threads limit
-  if (m_NumberOfWorkUnits > MultiThreaderBase::GetGlobalMaximumNumberOfThreads())
-  {
-    m_NumberOfWorkUnits = MultiThreaderBase::GetGlobalMaximumNumberOfThreads();
-  }
+  m_NumberOfWorkUnits = std::min(m_NumberOfWorkUnits, MultiThreaderBase::GetGlobalMaximumNumberOfThreads());
   for (threadCount = 0; threadCount < m_NumberOfWorkUnits; ++threadCount)
   {
     if (m_MultipleMethod[threadCount] == nullptr)

diff --git a/Modules/Filtering/ImageIntensity/include/itkIntensityWindowingImageFilter.hxx b/Modules/Filtering/ImageIntensity/include/itkIntensityWindowingImageFilter.hxx
@@ -29,6 +29,7 @@
 #define itkIntensityWindowingImageFilter_hxx
 
 #include "itkMinimumMaximumImageCalculator.h"
+#include <algorithm> // For min.
 
 namespace itk
 {
@@ -58,10 +59,7 @@ IntensityWindowingImageFilter<TInputImage, TOutputImage>::SetWindowLevel(const I
   }
 
   tmp2 = static_cast<InputRealType>(level) + (static_cast<InputRealType>(window) / 2.0);
-  if (tmp2 > NumericTraits<InputPixelType>::max())
-  {
-    tmp2 = NumericTraits<InputPixelType>::max();
-  }
+  tmp2 = std::min<InputRealType>(tmp2, NumericTraits<InputPixelType>::max());
 
   this->m_WindowMinimum = static_cast<InputPixelType>(tmp1);
   this->m_WindowMaximum = static_cast<InputPixelType>(tmp2);

diff --git a/Modules/Filtering/Smoothing/include/itkBoxUtilities.h b/Modules/Filtering/Smoothing/include/itkBoxUtilities.h
@@ -27,6 +27,7 @@
 #include "itkOffset.h"
 #include "itkNeighborhoodAlgorithm.h"
 #include "itkZeroFluxNeumannBoundaryCondition.h"
+#include <algorithm> // For min.
 
 /*
  *
@@ -358,10 +359,7 @@ BoxMeanCalculatorFunction(const TInputImage *               accImage,
             if (unitCorners[k][j] > 0)
             {
               // leading edge - crop it
-              if (thisCorner[j] > static_cast<OffsetValueType>(regionLimit[j]))
-              {
-                thisCorner[j] = static_cast<OffsetValueType>(regionLimit[j]);
-              }
+              thisCorner[j] = std::min(thisCorner[j], static_cast<OffsetValueType>(regionLimit[j]));
             }
             else
             {
@@ -551,10 +549,7 @@ BoxSigmaCalculatorFunction(const TInputImage *               accImage,
             if (unitCorners[k][j] > 0)
             {
               // leading edge - crop it
-              if (thisCorner[j] > static_cast<OffsetValueType>(regionLimit[j]))
-              {
-                thisCorner[j] = static_cast<OffsetValueType>(regionLimit[j]);
-              }
+              thisCorner[j] = std::min(thisCorner[j], static_cast<OffsetValueType>(regionLimit[j]));
             }
             else
             {

diff --git a/Modules/Segmentation/RegionGrowing/include/itkConfidenceConnectedImageFilter.hxx b/Modules/Segmentation/RegionGrowing/include/itkConfidenceConnectedImageFilter.hxx
@@ -27,6 +27,7 @@
 #include "itkFloodFilledImageFunctionConditionalIterator.h"
 #include "itkProgressReporter.h"
 #include "itkPrintHelper.h"
+#include <algorithm> // For min.
 
 namespace itk
 {
@@ -272,10 +273,7 @@ ConfidenceConnectedImageFilter<TInputImage, TOutputImage>::GenerateData()
   {
     lower = static_cast<InputRealType>(NumericTraits<InputImagePixelType>::NonpositiveMin());
   }
-  if (upper > static_cast<InputRealType>(NumericTraits<InputImagePixelType>::max()))
-  {
-    upper = static_cast<InputRealType>(NumericTraits<InputImagePixelType>::max());
-  }
+  upper = std::min(upper, static_cast<InputRealType>(NumericTraits<InputImagePixelType>::max()));
 
   function->ThresholdBetween(static_cast<InputImagePixelType>(lower), static_cast<InputImagePixelType>(upper));
 
@@ -359,10 +357,7 @@ ConfidenceConnectedImageFilter<TInputImage, TOutputImage>::GenerateData()
     {
       lower = static_cast<InputRealType>(NumericTraits<InputImagePixelType>::NonpositiveMin());
     }
-    if (upper > static_cast<InputRealType>(NumericTraits<InputImagePixelType>::max()))
-    {
-      upper = static_cast<InputRealType>(NumericTraits<InputImagePixelType>::max());
-    }
+    upper = std::min(upper, static_cast<InputRealType>(NumericTraits<InputImagePixelType>::max()));
 
     function->ThresholdBetween(static_cast<InputImagePixelType>(lower), static_cast<InputImagePixelType>(upper));