Replace SummaryCalculator by the SummaryStatUtil.

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

@@ -5,14 +5,15 @@
 
 package jetbrains.datalore.plot.base.stat
 
+import jetbrains.datalore.base.gcommon.collect.Ordering
 import jetbrains.datalore.plot.base.Aes
 import jetbrains.datalore.plot.base.DataFrame
 import jetbrains.datalore.plot.base.StatContext
 import jetbrains.datalore.plot.base.data.TransformVar
 import jetbrains.datalore.plot.common.data.SeriesUtil
 
 class SummaryStat(
- private val aggFunctionsMap: Map<Aes<*>, (SummaryCalculator) -> Double>
+ private val aggFunctionsMap: Map<Aes<*>, (List<Double>) -> Double>
 ) : BaseStat(DEF_MAPPING) {
 
  override fun consumes(): List<Aes<*>> {
@@ -53,12 +54,13 @@ class SummaryStat(
 
  val statValues: Map<Aes<*>, MutableList<Double>> = DEF_MAPPING.keys.associateWith { mutableListOf() }
  for ((x, bin) in binnedData) {
- val calc = SummaryCalculator(bin)
+ val sortedBin = Ordering.natural<Double>().sortedCopy(bin)
  for (aes in statValues.keys) {
  if (aes == Aes.X) {
  statValues[aes]!!.add(x)
  } else {
- statValues[aes]!!.add(aggFunctionsMap.getOrElse(aes) { SummaryCalculator::nan }(calc))
+ val aggFunction = aggFunctionsMap.getOrElse(aes) { SummaryStatUtil.nan }
+ statValues[aes]!!.add(aggFunction(sortedBin))
  }
  }
  }

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

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2023. JetBrains s.r.o.
+ * Use of this source code is governed by the MIT license that can be found in the LICENSE file.
+ */
+
+package jetbrains.datalore.plot.base.stat
+
+import kotlin.math.ceil
+import kotlin.math.floor
+import kotlin.math.round
+
+object SummaryStatUtil {
+ val nan: (List<Double>) -> Double = { Double.NaN }
+
+ fun count(sortedValues: List<Double>): Double {
+ return sortedValues.size.toDouble()
+ }
+
+ fun sum(sortedValues: List<Double>): Double {
+ return sortedValues.sum()
+ }
+
+ fun mean(sortedValues: List<Double>): Double {
+ return if (sortedValues.isEmpty()) {
+ Double.NaN
+ } else if (sortedValues.size == 1) {
+ sortedValues.first()
+ } else {
+ sum(sortedValues) / sortedValues.size
+ }
+ }
+
+ fun median(sortedValues: List<Double>): Double {
+ return quantile(0.5)(sortedValues)
+ }
+
+ fun min(sortedValues: List<Double>): Double {
+ return if (sortedValues.isEmpty()) {
+ Double.NaN
+ } else {
+ sortedValues.first()
+ }
+ }
+
+ fun max(sortedValues: List<Double>): Double {
+ return if (sortedValues.isEmpty()) {
+ Double.NaN
+ } else {
+ sortedValues.last()
+ }
+ }
+
+ fun q1(sortedValues: List<Double>): Double {
+ return quantile(0.25)(sortedValues)
+ }
+
+ fun q3(sortedValues: List<Double>): Double {
+ return quantile(0.75)(sortedValues)
+ }
+
+ fun quantile(p: Double): (List<Double>) -> Double {
+ return { sortedValues ->
+ if (sortedValues.isEmpty()) {
+ Double.NaN
+ } else if (sortedValues.size == 1) {
+ sortedValues.first()
+ } else {
+ val place = p * (sortedValues.size - 1)
+ val i = round(place)
+ if (place == i) {
+ sortedValues[place.toInt()]
+ } else {
+ (sortedValues[ceil(place).toInt()] + sortedValues[floor(place).toInt()]) / 2.0
+ }
+ }
+ }
+ }
+}

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

@@ -408,22 +408,22 @@ object StatProto {
  }
 
  private fun configureSummaryStat(options: OptionsAccessor): SummaryStat {
- fun getAggFunction(opts: OptionsAccessor, option: String, default: String): (SummaryCalculator) -> Double {
+ fun getAggFunction(opts: OptionsAccessor, option: String, default: String): (List<Double>) -> Double {
  return if (opts.isNumber(option)) {
  val p = opts.getDouble(option)!!
- { calc -> calc.quantile(p) }
+ SummaryStatUtil.quantile(p)
  } else {
  opts.getStringDef(option, default).let {
  when (it.lowercase()) {
- "nan" -> SummaryCalculator::nan
- "count" -> SummaryCalculator::count
- "sum" -> SummaryCalculator::sum
- "mean" -> SummaryCalculator::mean
- "median" -> SummaryCalculator::median
- "min" -> SummaryCalculator::min
- "max" -> SummaryCalculator::max
- "q1" -> SummaryCalculator::q1
- "q3" -> SummaryCalculator::q3
+ "nan" -> SummaryStatUtil.nan
+ "count" -> SummaryStatUtil::count
+ "sum" -> SummaryStatUtil::sum
+ "mean" -> SummaryStatUtil::mean
+ "median" -> SummaryStatUtil::median
+ "min" -> SummaryStatUtil::min
+ "max" -> SummaryStatUtil::max
+ "q1" -> SummaryStatUtil::q1
+ "q3" -> SummaryStatUtil::q3
  else -> throw IllegalArgumentException(
  "Unsupported function name: '$it'\n" +
  "Use one of: nan, count, sum, mean, median, min, max, q1, q3."
@@ -439,7 +439,7 @@ object StatProto {
  Aes.YMAX to getAggFunction(options, Summary.FUN_MAX, SummaryStat.DEF_MAX_AGG_FUN)
  )
 
- val additionalAggFunctions: MutableMap<Aes<*>, (SummaryCalculator) -> Double> = mutableMapOf()
+ val additionalAggFunctions: MutableMap<Aes<*>, (List<Double>) -> Double> = mutableMapOf()
  val funMap: Map<String, Any> = if (options.hasOwn(Summary.FUN_MAP)) {
  options.getMap(Summary.FUN_MAP)
  } else {