Slightly more efficiency in QgsStatisticalSummary

nyalldawson · nyalldawson · commit b2a2251fea65 · 2019-01-24T13:22:21.000+11:00
(cherry picked from commit 60a6fc1)
diff --git a/src/core/qgsstatisticalsummary.cpp b/src/core/qgsstatisticalsummary.cpp
@@ -47,6 +47,12 @@ void QgsStatisticalSummary::reset()
   mThirdQuartile = 0;
   mValueCount.clear();
   mValues.clear();
+
+  mRequiresHisto = mStatistics & QgsStatisticalSummary::Majority || mStatistics & QgsStatisticalSummary::Minority || mStatistics & QgsStatisticalSummary::Variety;
+
+  mRequiresAllValueStorage = mStatistics & QgsStatisticalSummary::StDev || mStatistics & QgsStatisticalSummary::StDevSample ||
+                             mStatistics & QgsStatisticalSummary::Median || mStatistics & QgsStatisticalSummary::FirstQuartile ||
+                             mStatistics & QgsStatisticalSummary::ThirdQuartile || mStatistics & QgsStatisticalSummary::InterQuartileRange;
 }
 
 /***************************************************************************
@@ -74,12 +80,10 @@ void QgsStatisticalSummary::addValue( double value )
   mMin = std::min( mMin, value );
   mMax = std::max( mMax, value );
 
-  if ( mStatistics & QgsStatisticalSummary::Majority || mStatistics & QgsStatisticalSummary::Minority || mStatistics & QgsStatisticalSummary::Variety )
+  if ( mRequiresHisto )
     mValueCount.insert( value, mValueCount.value( value, 0 ) + 1 );
 
-  if ( mStatistics & QgsStatisticalSummary::StDev || mStatistics & QgsStatisticalSummary::StDevSample ||
-       mStatistics & QgsStatisticalSummary::Median || mStatistics & QgsStatisticalSummary::FirstQuartile ||
-       mStatistics & QgsStatisticalSummary::ThirdQuartile || mStatistics & QgsStatisticalSummary::InterQuartileRange )
+  if ( mRequiresAllValueStorage )
     mValues << value;
 }
 
diff --git a/src/core/qgsstatisticalsummary.h b/src/core/qgsstatisticalsummary.h
@@ -292,6 +292,8 @@ class CORE_EXPORT QgsStatisticalSummary
     double mThirdQuartile;
     QMap< double, int > mValueCount;
     QList< double > mValues;
+    bool mRequiresAllValueStorage = false;
+    bool mRequiresHisto = false;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS( QgsStatisticalSummary::Statistics )
