move boxstats out of numeric header

Author: Fabien Servant

src/aliceVision/multiview/rotationAveraging/l1.cpp

@@ -29,6 +29,8 @@
 #include "ceres/ceres.h"
 #include "ceres/rotation.h"
 
+#include <aliceVision/numeric/BoxStats.hpp>
+
 #include <map>
 #include <queue>
 #include <stdint.h>

src/aliceVision/numeric/BoxStats.hpp

@@ -0,0 +1,86 @@
+// This file is part of the AliceVision project.
+// Copyright (c) 2024 AliceVision contributors.
+// Copyright (c) 2012 openMVG contributors.
+// This Source Code Form is subject to the terms of the Mozilla Public License,
+// v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+
+#include <algorithm>
+#include <cmath>
+#include <numeric>
+#include <string>
+#include <iostream>
+#include <vector>
+
+namespace aliceVision {
+
+
+/** Get back the min, mean, median and the max
+ *  values of an iterable sequence.
+ */
+template<typename Type>
+struct BoxStats
+{
+    Type min{}, max{}, mean{}, median{}, firstQuartile{}, thirdQuartile{};
+
+    BoxStats() = default;
+
+    template<typename DataInputIterator>
+    BoxStats(DataInputIterator begin, DataInputIterator end)
+    {
+        compute(begin, end);
+    }
+
+    template<typename DataInputIterator>
+    void compute(DataInputIterator begin, DataInputIterator end)
+    {
+        if (std::distance(begin, end) < 1)
+        {
+            min = 0;
+            max = 0;
+            mean = 0;
+            median = 0;
+            firstQuartile = 0;
+            thirdQuartile = 0;
+            return;
+        }
+
+        std::vector<Type> vec_val(begin, end);
+        std::sort(vec_val.begin(), vec_val.end());
+        min = vec_val[0];
+        max = vec_val[vec_val.size() - 1];
+        mean = accumulate(vec_val.begin(), vec_val.end(), Type(0)) / static_cast<Type>(vec_val.size());
+        median = vec_val[vec_val.size() / 2];
+        firstQuartile = vec_val[vec_val.size() / 4];
+        thirdQuartile = vec_val[(vec_val.size() * 3) / 4];
+    }
+};
+
+template<typename Type>
+inline std::ostream& operator<<(std::ostream& os, const BoxStats<Type> obj)
+{
+    os << "\t min: " << obj.min
+       << "\n"
+          "\t mean: "
+       << obj.mean
+       << "\n"
+          "\t median: "
+       << obj.median
+       << "\n"
+          "\t max: "
+       << obj.max
+       << "\n"
+          "\t first quartile: "
+       << obj.firstQuartile
+       << "\n"
+          "\t third quartile: "
+       << obj.thirdQuartile;
+
+    return os;
+}
+
+
+}  // namespace aliceVision

src/aliceVision/numeric/CMakeLists.txt

@@ -5,6 +5,7 @@ set(numeric_files_headers
   projection.hpp
   gps.hpp
   algebra.hpp
+  BoxStats.hpp
 )
 
 # Sources

src/aliceVision/numeric/numeric.hpp

@@ -385,70 +385,6 @@ inline int is_finite(const double val)
 #endif
 }
 
-/** Get back the min, mean, median and the max
- *  values of an iterable sequence.
- */
-template<typename Type>
-struct BoxStats
-{
-    Type min{}, max{}, mean{}, median{}, firstQuartile{}, thirdQuartile{};
-
-    BoxStats() = default;
-
-    template<typename DataInputIterator>
-    BoxStats(DataInputIterator begin, DataInputIterator end)
-    {
-        compute(begin, end);
-    }
-
-    template<typename DataInputIterator>
-    void compute(DataInputIterator begin, DataInputIterator end)
-    {
-        if (std::distance(begin, end) < 1)
-        {
-            min = 0;
-            max = 0;
-            mean = 0;
-            median = 0;
-            firstQuartile = 0;
-            thirdQuartile = 0;
-            return;
-        }
-
-        std::vector<Type> vec_val(begin, end);
-        std::sort(vec_val.begin(), vec_val.end());
-        min = vec_val[0];
-        max = vec_val[vec_val.size() - 1];
-        mean = accumulate(vec_val.begin(), vec_val.end(), Type(0)) / static_cast<Type>(vec_val.size());
-        median = vec_val[vec_val.size() / 2];
-        firstQuartile = vec_val[vec_val.size() / 4];
-        thirdQuartile = vec_val[(vec_val.size() * 3) / 4];
-    }
-};
-
-template<typename Type>
-inline std::ostream& operator<<(std::ostream& os, const BoxStats<Type> obj)
-{
-    os << "\t min: " << obj.min
-       << "\n"
-          "\t mean: "
-       << obj.mean
-       << "\n"
-          "\t median: "
-       << obj.median
-       << "\n"
-          "\t max: "
-       << obj.max
-       << "\n"
-          "\t first quartile: "
-       << obj.firstQuartile
-       << "\n"
-          "\t third quartile: "
-       << obj.thirdQuartile;
-
-    return os;
-}
-
 /**
  ** Split a range [ a ; b [ into a set of n ranges :
  [ a ; c1 [ U [ c1 ; c2 [ U ... U [ c(n-1) ; b [

src/aliceVision/sfm/generateReport.cpp

@@ -7,6 +7,7 @@
 
 #include "generateReport.hpp"
 #include <aliceVision/sfmData/SfMData.hpp>
+#include <aliceVision/numeric/BoxStats.hpp>
 
 #include <aliceVision/utils/Histogram.hpp>
 #include <dependencies/htmlDoc/htmlDoc.hpp>

src/aliceVision/sfm/pipeline/global/GlobalSfMRotationAveragingSolver.cpp

@@ -10,7 +10,7 @@
 #include <aliceVision/graph/graph.hpp>
 #include <aliceVision/multiview/rotationAveraging/rotationAveraging.hpp>
 #include <aliceVision/stl/mapUtils.hpp>
-
+#include <aliceVision/numeric/BoxStats.hpp>
 #include <aliceVision/utils/Histogram.hpp>
 
 namespace aliceVision {

src/aliceVision/sfm/pipeline/sequential/ReconstructionEngine_sequentialSfM.cpp

@@ -13,6 +13,7 @@
 #include <aliceVision/sfm/sfmFilters.hpp>
 #include <aliceVision/sfm/sfmStatistics.hpp>
 #include <aliceVision/sfm/utils/preprocess.hpp>
+#include <aliceVision/numeric/BoxStats.hpp>
 
 #include <aliceVision/feature/FeaturesPerView.hpp>
 #include <aliceVision/graph/connectedComponent.hpp>

src/aliceVision/sfm/sfmStatistics.hpp

@@ -11,7 +11,7 @@
 #include <aliceVision/track/Track.hpp>
 #include <aliceVision/track/tracksUtils.hpp>
 #include <aliceVision/stl/mapUtils.hpp>
-
+#include <aliceVision/numeric/BoxStats.hpp>
 #include <aliceVision/utils/Histogram.hpp>
 
 namespace aliceVision {

src/software/utils/precisionEvaluationToGt.hpp

@@ -9,6 +9,7 @@
 
 #include <aliceVision/numeric/numeric.hpp>
 #include <aliceVision/geometry/rigidTransformation3D.hpp>
+#include <aliceVision/numeric/BoxStats.hpp>
 
 #include <aliceVision/utils/Histogram.hpp>
 #include <dependencies/htmlDoc/htmlDoc.hpp>