Skip to content

Commit 97f0388

Browse files
committed
improved maxFor implementation
1 parent dd13f2e commit 97f0388

File tree

1 file changed

+3
-15
lines changed
  • core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api

1 file changed

+3
-15
lines changed

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,7 @@ public fun <T> DataFrame<T>.max(skipNaN: Boolean = skipNaNDefault): DataRow<T> =
8484
public fun <T, C : Comparable<*>?> DataFrame<T>.maxFor(
8585
skipNaN: Boolean = skipNaNDefault,
8686
columns: ColumnsForAggregateSelector<T, C>,
87-
): DataRow<T> {
88-
@Suppress("UNCHECKED_CAST")
89-
return Aggregators.max<Comparable<Any>?>(skipNaN)
90-
.aggregateFor(this, columns as ColumnsForAggregateSelector<T, Comparable<Any>?>)
91-
}
87+
): DataRow<T> = Aggregators.max.invoke(skipNaN).aggregateFor(this, columns)
9288

9389
public fun <T> DataFrame<T>.maxFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow<T> =
9490
maxFor(skipNaN) { columns.toComparableColumns() }
@@ -219,11 +215,7 @@ public fun <T> Grouped<T>.max(skipNaN: Boolean = skipNaNDefault): DataFrame<T> =
219215
public fun <T, C : Comparable<*>?> Grouped<T>.maxFor(
220216
skipNaN: Boolean = skipNaNDefault,
221217
columns: ColumnsForAggregateSelector<T, C>,
222-
): DataFrame<T> {
223-
@Suppress("UNCHECKED_CAST")
224-
return Aggregators.max<Comparable<Any>?>(skipNaN)
225-
.aggregateFor(this, columns as ColumnsForAggregateSelector<T, Comparable<Any>?>)
226-
}
218+
): DataFrame<T> = Aggregators.max.invoke(skipNaN).aggregateFor(this, columns)
227219

228220
public fun <T> Grouped<T>.maxFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame<T> =
229221
maxFor(skipNaN) { columns.toComparableColumns() }
@@ -400,11 +392,7 @@ public fun <T, R : Comparable<*>?> PivotGroupBy<T>.maxFor(
400392
separate: Boolean = false,
401393
skipNaN: Boolean = skipNaNDefault,
402394
columns: ColumnsForAggregateSelector<T, R>,
403-
): DataFrame<T> {
404-
@Suppress("UNCHECKED_CAST")
405-
return Aggregators.max<Comparable<Any>?>(skipNaN)
406-
.aggregateFor(this, separate, columns as ColumnsForAggregateSelector<T, Comparable<Any>?>)
407-
}
395+
): DataFrame<T> = Aggregators.max.invoke(skipNaN).aggregateFor(this, separate, columns)
408396

409397
public fun <T> PivotGroupBy<T>.maxFor(
410398
vararg columns: String,

0 commit comments

Comments
 (0)