diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt index ee74961f1e..d1ff0cd1e2 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt @@ -235,7 +235,7 @@ public fun ?> Grouped.maxFor( ): DataFrame = maxFor(skipNaN) { columns.toColumnSet() } @Refine -@Interpretable("GroupByMax0") +@Interpretable("GroupByMax2") public fun ?> Grouped.max( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -598,13 +598,9 @@ public inline fun ?> DataFrame.maxByOrNull public inline fun ?> DataFrame.maxByOrNull(column: KProperty): DataRow? = maxByOrNull(column, skipNaN = skipNaNDefault) -@Refine -@Interpretable("GroupByMax1") @Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public fun Grouped.max(): DataFrame = max(skipNaN = skipNaNDefault) -@Refine -@Interpretable("GroupByMax0") @Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public fun ?> Grouped.maxFor(columns: ColumnsForAggregateSelector): DataFrame = maxFor(skipNaN = skipNaNDefault, columns = columns) @@ -623,8 +619,6 @@ public fun ?> Grouped.maxFor(vararg columns: ColumnRefer public fun ?> Grouped.maxFor(vararg columns: KProperty): DataFrame = maxFor(columns = columns, skipNaN = skipNaNDefault) -@Refine -@Interpretable("GroupByMax0") @Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public fun ?> Grouped.max( name: String? = null, @@ -649,15 +643,12 @@ public fun ?> Grouped.max( name: String? = null, ): DataFrame = max(columns = columns, name = name, skipNaN = skipNaNDefault) -@Refine -@Interpretable("GroupByMaxOf") @Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public inline fun ?> Grouped.maxOf( name: String? = null, crossinline expression: RowExpression, ): DataFrame = maxOf(name, skipNaN = skipNaNDefault, expression = expression) -@Interpretable("GroupByReduceExpression") @Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public inline fun ?> GroupBy.maxBy( crossinline rowExpression: RowExpression, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt index 1229b960aa..892326763d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt @@ -150,7 +150,7 @@ public fun Grouped.meanFor( ): DataFrame = meanFor(skipNaN) { columns.toColumnSet() } @Refine -@Interpretable("GroupByMean0") +@Interpretable("GroupByMean2") public fun Grouped.mean( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -353,13 +353,9 @@ public fun DataFrame.mean(vararg columns: KProperty): Dou public inline fun DataFrame.meanOf(crossinline expression: RowExpression): Double = meanOf(skipNaN = skipNaNDefault, expression = expression) -@Refine -@Interpretable("GroupByMean1") @Deprecated(MEAN_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public fun Grouped.mean(): DataFrame = mean(skipNaN = skipNaNDefault) -@Refine -@Interpretable("GroupByMean0") @Deprecated(MEAN_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public fun Grouped.meanFor(columns: ColumnsForAggregateSelector): DataFrame = meanFor(skipNaN = skipNaNDefault, columns = columns) @@ -378,8 +374,6 @@ public fun Grouped.meanFor(vararg columns: ColumnReference Grouped.meanFor(vararg columns: KProperty): DataFrame = meanFor(columns = columns, skipNaN = skipNaNDefault) -@Refine -@Interpretable("GroupByMean0") @Deprecated(MEAN_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public fun Grouped.mean(name: String? = null, columns: ColumnsSelector): DataFrame = mean(name, skipNaN = skipNaNDefault, columns = columns) @@ -398,8 +392,6 @@ public fun Grouped.mean(vararg columns: ColumnReference, public fun Grouped.mean(vararg columns: KProperty, name: String? = null): DataFrame = mean(columns = columns, name = name, skipNaN = skipNaNDefault) -@Refine -@Interpretable("GroupByMeanOf") @Deprecated(MEAN_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public inline fun Grouped.meanOf( name: String? = null, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt index 91a0a0583e..576a17ea18 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt @@ -353,7 +353,7 @@ public fun ?> Grouped.medianFor( ): DataFrame = medianFor(skipNaN) { columns.toColumnSet() } @Refine -@Interpretable("GroupByMedian0") +@Interpretable("GroupByMedian2") public fun ?> Grouped.median( name: String? = null, skipNaN: Boolean = skipNaNDefault, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt index a0c8603a7a..6246e7205c 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt @@ -235,7 +235,7 @@ public fun ?> Grouped.minFor( ): DataFrame = minFor(skipNaN) { columns.toColumnSet() } @Refine -@Interpretable("GroupByMin0") +@Interpretable("GroupByMin2") public fun ?> Grouped.min( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -598,13 +598,9 @@ public inline fun ?> DataFrame.minByOrNull public inline fun ?> DataFrame.minByOrNull(column: KProperty): DataRow? = minByOrNull(column, skipNaN = skipNaNDefault) -@Refine -@Interpretable("GroupByMin1") @Deprecated(MIN_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public fun Grouped.min(): DataFrame = min(skipNaN = skipNaNDefault) -@Refine -@Interpretable("GroupByMin0") @Deprecated(MIN_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public fun ?> Grouped.minFor(columns: ColumnsForAggregateSelector): DataFrame = minFor(skipNaN = skipNaNDefault, columns = columns) @@ -623,8 +619,6 @@ public fun ?> Grouped.minFor(vararg columns: ColumnRefer public fun ?> Grouped.minFor(vararg columns: KProperty): DataFrame = minFor(columns = columns, skipNaN = skipNaNDefault) -@Refine -@Interpretable("GroupByMin0") @Deprecated(MIN_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public fun ?> Grouped.min( name: String? = null, @@ -649,15 +643,12 @@ public fun ?> Grouped.min( name: String? = null, ): DataFrame = min(columns = columns, name = name, skipNaN = skipNaNDefault) -@Refine -@Interpretable("GroupByMinOf") @Deprecated(MIN_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public inline fun ?> Grouped.minOf( name: String? = null, crossinline expression: RowExpression, ): DataFrame = minOf(name, skipNaN = skipNaNDefault, expression = expression) -@Interpretable("GroupByReduceExpression") @Deprecated(MIN_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public inline fun ?> GroupBy.minBy( crossinline rowExpression: RowExpression, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt index f015826149..be666a8448 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt @@ -421,7 +421,7 @@ public fun ?> Grouped.percentileFor( ): DataFrame = percentileFor(percentile, skipNaN) { columns.toColumnSet() } @Refine -@Interpretable("GroupByPercentile0") +@Interpretable("GroupByPercentile2") public fun ?> Grouped.percentile( percentile: Double, name: String? = null, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt index 38966ec8d6..e16b7820e6 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt @@ -160,7 +160,7 @@ public fun Grouped.stdFor( ): DataFrame = stdFor(skipNaN, ddof) { columns.toColumnSet() } @Refine -@Interpretable("GroupByStd0") +@Interpretable("GroupByStd2") public fun Grouped.std( name: String? = null, skipNaN: Boolean = skipNaNDefault, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt index 2b7f3724de..93d042e6d9 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt @@ -263,7 +263,7 @@ public fun Grouped.sumFor( ): DataFrame = sumFor(skipNaN) { columns.toColumnSet() } @Refine -@Interpretable("GroupBySum0") +@Interpretable("GroupBySum2") public fun Grouped.sum( name: String? = null, skipNaN: Boolean = skipNaNDefault, @@ -500,13 +500,9 @@ public inline fun DataFrame.sum(vararg columns: KPro public inline fun DataFrame.sumOf(crossinline expression: RowExpression): C & Any = sumOf(skipNaN = skipNaNDefault, expression = expression) -@Refine -@Interpretable("GroupBySum1") @Deprecated(SUM_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public fun Grouped.sum(): DataFrame = sum(skipNaN = skipNaNDefault) -@Refine -@Interpretable("GroupBySum0") @Deprecated(SUM_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public fun Grouped.sumFor(columns: ColumnsForAggregateSelector): DataFrame = sumFor(skipNaN = skipNaNDefault, columns = columns) @@ -525,8 +521,6 @@ public fun Grouped.sumFor(vararg columns: ColumnReference public fun Grouped.sumFor(vararg columns: KProperty): DataFrame = sumFor(columns = columns, skipNaN = skipNaNDefault) -@Refine -@Interpretable("GroupBySum0") @Deprecated(SUM_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public fun Grouped.sum(name: String? = null, columns: ColumnsSelector): DataFrame = sum(name, skipNaN = skipNaNDefault, columns = columns) @@ -545,8 +539,6 @@ public fun Grouped.sum(vararg columns: ColumnReference, n public fun Grouped.sum(vararg columns: KProperty, name: String? = null): DataFrame = sum(columns = columns, name = name, skipNaN = skipNaNDefault) -@Refine -@Interpretable("GroupBySumOf") @Deprecated(SUM_NO_SKIPNAN, level = DeprecationLevel.HIDDEN) public inline fun Grouped.sumOf( resultName: String? = null,