Remove extra enum class from the SummaryStatUtil.

plot-base-portable/src/commonMain/kotlin/jetbrains/datalore/plot/base/stat/SummaryStat.kt

@@ -52,7 +52,7 @@ class SummaryStat(
         }
 
         val statValues: Map<Aes<*>, MutableList<Double>> = DEF_MAPPING.keys.associateWith { mutableListOf() }
-        val defaultAggFun = SummaryStatUtil.AggFun.NAN.aggFun
+        val defaultAggFun: (SummaryStatUtil.Calculator) -> Double = { calc -> calc.nan }
         for ((x, bin) in binnedData) {
             val calc = SummaryStatUtil.Calculator(bin)
             for (aes in statValues.keys) {

plot-base-portable/src/commonMain/kotlin/jetbrains/datalore/plot/base/stat/SummaryStatUtil.kt

@@ -18,88 +18,35 @@ object SummaryStatUtil {
     class Calculator(values: List<Double>) {
         private val sortedValues: List<Double> = Ordering.natural<Double>().sortedCopy(values)
 
-        private var count: Double? = null
-        private var sum: Double? = null
-        private var mean: Double? = null
-        private var median: Double? = null
-        private var min: Double? = null
-        private var max: Double? = null
-        private var q1: Double? = null
-        private var q3: Double? = null
-
-        fun nan(): Double {
-            return Double.NaN
-        }
-
-        fun count(): Double {
-            if (count == null) {
-                count = sortedValues.size.toDouble()
-            }
-            return count!!
-        }
-
-        fun sum(): Double {
-            if (sum == null) {
-                sum = sortedValues.sum()
-            }
-            return sum!!
-        }
-
-        fun mean(): Double {
-            if (mean == null) {
-                mean = if (sortedValues.isEmpty()) {
-                    Double.NaN
-                } else if (sortedValues.size == 1) {
-                    sortedValues.first()
-                } else {
-                    sum() / sortedValues.size
-                }
-            }
-            return mean!!
-        }
-
-        fun median(): Double {
-            if (median == null) {
-                median = quantile(0.5)
-            }
-            return median!!
-        }
-
-        fun min(): Double {
-            if (min == null) {
-                min = if (sortedValues.isEmpty()) {
-                    Double.NaN
-                } else {
-                    sortedValues.first()
-                }
-            }
-            return min!!
-        }
-
-        fun max(): Double {
-            if (max == null) {
-                max = if (sortedValues.isEmpty()) {
-                    Double.NaN
-                } else {
-                    sortedValues.last()
-                }
+        val nan = Double.NaN
+        val count by lazy { sortedValues.size.toDouble() }
+        val sum by lazy { sortedValues.sum() }
+        val mean by lazy {
+            if (sortedValues.isEmpty()) {
+                Double.NaN
+            } else if (sortedValues.size == 1) {
+                sortedValues.first()
+            } else {
+                sum / sortedValues.size
             }
-            return max!!
         }
-
-        fun q1(): Double {
-            if (q1 == null) {
-                q1 = quantile(0.25)
+        val median by lazy { quantile(0.5) }
+        val min by lazy {
+            if (sortedValues.isEmpty()) {
+                Double.NaN
+            } else {
+                sortedValues.first()
             }
-            return q1!!
         }
-
-        fun q3(): Double {
-            if (q3 == null) {
-                q3 = quantile(0.75)
+        val max by lazy {
+            if (sortedValues.isEmpty()) {
+                Double.NaN
+            } else {
+                sortedValues.last()
             }
-            return q3!!
         }
+        val q1 by lazy { quantile(0.25) }
+        val q3 by lazy { quantile(0.75) }
 
         fun quantile(p: Double): Double {
             if (sortedValues.isEmpty()) {
@@ -117,16 +64,4 @@ object SummaryStatUtil {
             }
         }
     }
-
-    enum class AggFun(val aggFun: (Calculator) -> Double) {
-        NAN({ calc -> calc.nan() }),
-        COUNT({ calc -> calc.count() }),
-        SUM({ calc -> calc.sum() }),
-        MEAN({ calc -> calc.mean() }),
-        MEDIAN({ calc -> calc.median() }),
-        MIN({ calc -> calc.min() }),
-        MAX({ calc -> calc.max() }),
-        Q1({ calc -> calc.q1() }),
-        Q3({ calc -> calc.q3() }),
-    }
 }

plot-config-portable/src/commonMain/kotlin/jetbrains/datalore/plot/config/StatProto.kt

@@ -414,15 +414,15 @@ object StatProto {
             } else {
                 opts.getStringDef(option, default).let {
                     when (it.lowercase()) {
-                        "nan" -> SummaryStatUtil.AggFun.NAN.aggFun
-                        "count" -> SummaryStatUtil.AggFun.COUNT.aggFun
-                        "sum" -> SummaryStatUtil.AggFun.SUM.aggFun
-                        "mean" -> SummaryStatUtil.AggFun.MEAN.aggFun
-                        "median" -> SummaryStatUtil.AggFun.MEDIAN.aggFun
-                        "min" -> SummaryStatUtil.AggFun.MIN.aggFun
-                        "max" -> SummaryStatUtil.AggFun.MAX.aggFun
-                        "q1" -> SummaryStatUtil.AggFun.Q1.aggFun
-                        "q3" -> SummaryStatUtil.AggFun.Q3.aggFun
+                        "nan" -> { calc -> calc.nan }
+                        "count" -> { calc -> calc.count }
+                        "sum" -> { calc -> calc.sum }
+                        "mean" -> { calc -> calc.mean }
+                        "median" -> { calc -> calc.median }
+                        "min" -> { calc -> calc.min }
+                        "max" -> { calc -> calc.max }
+                        "q1" -> { calc -> calc.q1 }
+                        "q3" -> { calc -> calc.q3 }
                         else -> throw IllegalArgumentException(
                             "Unsupported function name: '$it'\n" +
                             "Use one of: nan, count, sum, mean, median, min, max, q1, q3."