BUG: fix Statistics::Histogram::Mean calculation

This method was introduced by fb95a5e, but it never worked properly, always returning 1.
InsightSoftwareConsortium · Jun 14, 2020 · 147ac45 · 147ac45
1 parent 0c02a5d
commit 147ac45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Modules/Filtering/Thresholding/test/CMakeLists.txt b/Modules/Filtering/Thresholding/test/CMakeLists.txt
@@ -121,7 +121,7 @@ itk_add_test(NAME itkIsoDataThresholdImageFilterTestNoAutoMinMax
       COMMAND ITKThresholdingTestDriver
     --compare-MD5 DATA{Baseline/itkIsoDataThresholdImageFilterTestNoAutoMinMax.png}
               9f844fd120ff49a7812e329a1b0216d8
-    itkIsoDataThresholdImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} ${ITK_TEST_OUTPUT_DIR}/itkIsoDataThresholdImageFilterTestNoAutoMinMax.png 32 0 1)
+    itkIsoDataThresholdImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} ${ITK_TEST_OUTPUT_DIR}/itkIsoDataThresholdImageFilterTestNoAutoMinMax.png 32 0 1023)
 
 itk_add_test(NAME itkIsoDataMaskedThresholdImageFilterTest
       COMMAND ITKThresholdingTestDriver

diff --git a/Modules/Numerics/Statistics/include/itkHistogram.hxx b/Modules/Numerics/Statistics/include/itkHistogram.hxx
@@ -645,11 +645,12 @@ double
 Histogram<TMeasurement, TFrequencyContainer>::Mean(unsigned int dimension) const
 {
   const unsigned int size = this->GetSize(dimension);
-  auto               totalFrequency = double(this->GetTotalFrequency());
+  double             totalFrequency = this->GetTotalFrequency();
   double             sum = 0;
   for (unsigned int i = 0; i < size; i++)
   {
-    sum += this->GetFrequency(i, dimension);
+    double frequency = this->GetFrequency(i, dimension);
+    sum += frequency * this->GetMeasurement(i, dimension);
   }
   return sum / totalFrequency;
 }