[processing] Optimise basic stats numbers algorithm

qgis · Nov 30, 2016 · e272bb3 · e272bb3
1 parent a927d97
commit e272bb3
Showing 1 changed file with 10 additions and 28 deletions.
diff --git a/python/plugins/processing/algs/qgis/BasicStatisticsNumbers.py b/python/plugins/processing/algs/qgis/BasicStatisticsNumbers.py
@@ -31,7 +31,9 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QgsStatisticalSummary
+from qgis.core import (QgsStatisticalSummary,
+                       QgsFeatureRequest,
+                       NULL)
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
@@ -107,36 +109,16 @@ def processAlgorithm(self, progress):
 
         outputFile = self.getOutputValue(self.OUTPUT_HTML_FILE)
 
-        cvValue = 0
+        request = QgsFeatureRequest().setFlags(QgsFeatureRequest.NoGeometry).setSubsetOfAttributes([fieldName], layer.fields())
-        minValue = 0
+        stat = QgsStatisticalSummary()
-        maxValue = 0
+        features = vector.features(layer, request)
-        sumValue = 0
-        meanValue = 0
-        medianValue = 0
-        stdDevValue = 0
-        minority = 0
-        majority = 0
-        firstQuartile = 0
-        thirdQuartile = 0
-        nullValues = 0
-        iqr = 0
-
-        values = []
-
-        features = vector.features(layer)
         count = len(features)
         total = 100.0 / float(count)
         for current, ft in enumerate(features):
-            value = ft[fieldName]
+            stat.addVariant(ft[fieldName])
-            if value or value == 0:
-                values.append(float(value))
-            else:
-                nullValues += 1
-
             progress.setPercentage(int(current * total))
 
-        stat = QgsStatisticalSummary()
+        stat.finalize()
-        stat.calculate(values)
 
         count = stat.count()
         uniqueValue = stat.variety()
@@ -147,13 +129,13 @@ def processAlgorithm(self, progress):
         meanValue = stat.mean()
         medianValue = stat.median()
         stdDevValue = stat.stDev()
-        if meanValue != 0.00:
+        cvValue = stdDevValue / meanValue if meanValue != 0 else 0
-            cvValue = stdDevValue / meanValue
         minority = stat.minority()
         majority = stat.majority()
         firstQuartile = stat.firstQuartile()
         thirdQuartile = stat.thirdQuartile()
         iqr = stat.interQuartileRange()
+        nullValues = stat.countMissing()
 
         data = []
         data.append(self.tr('Analyzed layer: {}').format(layer.name()))