Skip to content

Commit a175f7c

Browse files
JolanrensenJolanrensen
authored
Merge pull request #1430 from Kotlin/jetbrains-junie-issue-1429-run-8d300026-5367-4d55-818f-5921b031bafd
Relax type constraints `xxxFor {}` statistics functions
2 parents 6f33e75 + 4439015 commit a175f7c

File tree

9 files changed

+95
-95
lines changed

9 files changed

+95
-95
lines changed

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -81,24 +81,24 @@ public fun <T> DataFrame<T>.max(skipNaN: Boolean = skipNaNDefault): DataRow<T> =
8181

8282
@Refine
8383
@Interpretable("Max1")
84-
public fun <T, C : Comparable<C & Any>?> DataFrame<T>.maxFor(
84+
public fun <T, C : Comparable<*>?> DataFrame<T>.maxFor(
8585
skipNaN: Boolean = skipNaNDefault,
8686
columns: ColumnsForAggregateSelector<T, C>,
87-
): DataRow<T> = Aggregators.max<C>(skipNaN).aggregateFor(this, columns)
87+
): DataRow<T> = Aggregators.max.invoke(skipNaN).aggregateFor(this, columns)
8888

8989
public fun <T> DataFrame<T>.maxFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow<T> =
9090
maxFor(skipNaN) { columns.toComparableColumns() }
9191

9292
@Deprecated(DEPRECATED_ACCESS_API)
9393
@AccessApiOverload
94-
public fun <T, C : Comparable<C & Any>?> DataFrame<T>.maxFor(
94+
public fun <T, C : Comparable<*>?> DataFrame<T>.maxFor(
9595
vararg columns: ColumnReference<C>,
9696
skipNaN: Boolean = skipNaNDefault,
9797
): DataRow<T> = maxFor(skipNaN) { columns.toColumnSet() }
9898

9999
@Deprecated(DEPRECATED_ACCESS_API)
100100
@AccessApiOverload
101-
public fun <T, C : Comparable<C & Any>?> DataFrame<T>.maxFor(
101+
public fun <T, C : Comparable<*>?> DataFrame<T>.maxFor(
102102
vararg columns: KProperty<C>,
103103
skipNaN: Boolean = skipNaNDefault,
104104
): DataRow<T> = maxFor(skipNaN) { columns.toColumnSet() }
@@ -212,24 +212,24 @@ public fun <T> Grouped<T>.max(skipNaN: Boolean = skipNaNDefault): DataFrame<T> =
212212

213213
@Refine
214214
@Interpretable("GroupByMax0")
215-
public fun <T, C : Comparable<C & Any>?> Grouped<T>.maxFor(
215+
public fun <T, C : Comparable<*>?> Grouped<T>.maxFor(
216216
skipNaN: Boolean = skipNaNDefault,
217217
columns: ColumnsForAggregateSelector<T, C>,
218-
): DataFrame<T> = Aggregators.max<C>(skipNaN).aggregateFor(this, columns)
218+
): DataFrame<T> = Aggregators.max.invoke(skipNaN).aggregateFor(this, columns)
219219

220220
public fun <T> Grouped<T>.maxFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame<T> =
221221
maxFor(skipNaN) { columns.toComparableColumns() }
222222

223223
@Deprecated(DEPRECATED_ACCESS_API)
224224
@AccessApiOverload
225-
public fun <T, C : Comparable<C & Any>?> Grouped<T>.maxFor(
225+
public fun <T, C : Comparable<*>?> Grouped<T>.maxFor(
226226
vararg columns: ColumnReference<C>,
227227
skipNaN: Boolean = skipNaNDefault,
228228
): DataFrame<T> = maxFor(skipNaN) { columns.toColumnSet() }
229229

230230
@Deprecated(DEPRECATED_ACCESS_API)
231231
@AccessApiOverload
232-
public fun <T, C : Comparable<C & Any>?> Grouped<T>.maxFor(
232+
public fun <T, C : Comparable<*>?> Grouped<T>.maxFor(
233233
vararg columns: KProperty<C>,
234234
skipNaN: Boolean = skipNaNDefault,
235235
): DataFrame<T> = maxFor(skipNaN) { columns.toColumnSet() }
@@ -302,7 +302,7 @@ public inline fun <T, G, reified C : Comparable<C & Any>?> GroupBy<T, G>.maxBy(
302302
public fun <T> Pivot<T>.max(separate: Boolean = false, skipNaN: Boolean = skipNaNDefault): DataRow<T> =
303303
delegate { max(separate, skipNaN) }
304304

305-
public fun <T, R : Comparable<R & Any>?> Pivot<T>.maxFor(
305+
public fun <T, R : Comparable<*>?> Pivot<T>.maxFor(
306306
separate: Boolean = false,
307307
skipNaN: Boolean = skipNaNDefault,
308308
columns: ColumnsForAggregateSelector<T, R>,
@@ -316,15 +316,15 @@ public fun <T> Pivot<T>.maxFor(
316316

317317
@Deprecated(DEPRECATED_ACCESS_API)
318318
@AccessApiOverload
319-
public fun <T, R : Comparable<R & Any>?> Pivot<T>.maxFor(
319+
public fun <T, R : Comparable<*>?> Pivot<T>.maxFor(
320320
vararg columns: ColumnReference<R>,
321321
separate: Boolean = false,
322322
skipNaN: Boolean = skipNaNDefault,
323323
): DataRow<T> = maxFor(separate, skipNaN) { columns.toColumnSet() }
324324

325325
@Deprecated(DEPRECATED_ACCESS_API)
326326
@AccessApiOverload
327-
public fun <T, R : Comparable<R & Any>?> Pivot<T>.maxFor(
327+
public fun <T, R : Comparable<*>?> Pivot<T>.maxFor(
328328
vararg columns: KProperty<R>,
329329
separate: Boolean = false,
330330
skipNaN: Boolean = skipNaNDefault,
@@ -388,11 +388,11 @@ public inline fun <T, reified C : Comparable<C & Any>?> Pivot<T>.maxBy(
388388
public fun <T> PivotGroupBy<T>.max(separate: Boolean = false, skipNaN: Boolean = skipNaNDefault): DataFrame<T> =
389389
maxFor(separate, skipNaN, intraComparableColumns())
390390

391-
public fun <T, R : Comparable<R & Any>?> PivotGroupBy<T>.maxFor(
391+
public fun <T, R : Comparable<*>?> PivotGroupBy<T>.maxFor(
392392
separate: Boolean = false,
393393
skipNaN: Boolean = skipNaNDefault,
394394
columns: ColumnsForAggregateSelector<T, R>,
395-
): DataFrame<T> = Aggregators.max<R>(skipNaN).aggregateFor(this, separate, columns)
395+
): DataFrame<T> = Aggregators.max.invoke(skipNaN).aggregateFor(this, separate, columns)
396396

397397
public fun <T> PivotGroupBy<T>.maxFor(
398398
vararg columns: String,
@@ -402,15 +402,15 @@ public fun <T> PivotGroupBy<T>.maxFor(
402402

403403
@Deprecated(DEPRECATED_ACCESS_API)
404404
@AccessApiOverload
405-
public fun <T, R : Comparable<R & Any>?> PivotGroupBy<T>.maxFor(
405+
public fun <T, R : Comparable<*>?> PivotGroupBy<T>.maxFor(
406406
vararg columns: ColumnReference<R>,
407407
separate: Boolean = false,
408408
skipNaN: Boolean = skipNaNDefault,
409409
): DataFrame<T> = maxFor(separate, skipNaN) { columns.toColumnSet() }
410410

411411
@Deprecated(DEPRECATED_ACCESS_API)
412412
@AccessApiOverload
413-
public fun <T, R : Comparable<R & Any>?> PivotGroupBy<T>.maxFor(
413+
public fun <T, R : Comparable<*>?> PivotGroupBy<T>.maxFor(
414414
vararg columns: KProperty<R>,
415415
separate: Boolean = false,
416416
skipNaN: Boolean = skipNaNDefault,
@@ -500,7 +500,7 @@ public inline fun <reified T : Comparable<T & Any>?> AnyRow.rowMaxOf(): T & Any
500500
public fun <T> DataFrame<T>.max(): DataRow<T> = max(skipNaN = skipNaNDefault)
501501

502502
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
503-
public fun <T, C : Comparable<C & Any>?> DataFrame<T>.maxFor(columns: ColumnsForAggregateSelector<T, C>): DataRow<T> =
503+
public fun <T, C : Comparable<*>?> DataFrame<T>.maxFor(columns: ColumnsForAggregateSelector<T, C>): DataRow<T> =
504504
maxFor(skipNaN = skipNaNDefault, columns = columns)
505505

506506
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
@@ -509,12 +509,12 @@ public fun <T> DataFrame<T>.maxFor(vararg columns: String): DataRow<T> =
509509

510510
@AccessApiOverload
511511
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
512-
public fun <T, C : Comparable<C & Any>?> DataFrame<T>.maxFor(vararg columns: ColumnReference<C>): DataRow<T> =
512+
public fun <T, C : Comparable<*>?> DataFrame<T>.maxFor(vararg columns: ColumnReference<C>): DataRow<T> =
513513
maxFor(columns = columns, skipNaN = skipNaNDefault)
514514

515515
@AccessApiOverload
516516
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
517-
public fun <T, C : Comparable<C & Any>?> DataFrame<T>.maxFor(vararg columns: KProperty<C>): DataRow<T> =
517+
public fun <T, C : Comparable<*>?> DataFrame<T>.maxFor(vararg columns: KProperty<C>): DataRow<T> =
518518
maxFor(columns = columns, skipNaN = skipNaNDefault)
519519

520520
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
@@ -608,7 +608,7 @@ public fun <T> Grouped<T>.max(): DataFrame<T> = max(skipNaN = skipNaNDefault)
608608
@Refine
609609
@Interpretable("GroupByMax0")
610610
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
611-
public fun <T, C : Comparable<C & Any>?> Grouped<T>.maxFor(columns: ColumnsForAggregateSelector<T, C>): DataFrame<T> =
611+
public fun <T, C : Comparable<*>?> Grouped<T>.maxFor(columns: ColumnsForAggregateSelector<T, C>): DataFrame<T> =
612612
maxFor(skipNaN = skipNaNDefault, columns = columns)
613613

614614
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
@@ -617,12 +617,12 @@ public fun <T> Grouped<T>.maxFor(vararg columns: String): DataFrame<T> =
617617

618618
@AccessApiOverload
619619
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
620-
public fun <T, C : Comparable<C & Any>?> Grouped<T>.maxFor(vararg columns: ColumnReference<C>): DataFrame<T> =
620+
public fun <T, C : Comparable<*>?> Grouped<T>.maxFor(vararg columns: ColumnReference<C>): DataFrame<T> =
621621
maxFor(columns = columns, skipNaN = skipNaNDefault)
622622

623623
@AccessApiOverload
624624
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
625-
public fun <T, C : Comparable<C & Any>?> Grouped<T>.maxFor(vararg columns: KProperty<C>): DataFrame<T> =
625+
public fun <T, C : Comparable<*>?> Grouped<T>.maxFor(vararg columns: KProperty<C>): DataFrame<T> =
626626
maxFor(columns = columns, skipNaN = skipNaNDefault)
627627

628628
@Refine
@@ -684,7 +684,7 @@ public inline fun <T, G, reified C : Comparable<C & Any>?> GroupBy<T, G>.maxBy(
684684
public fun <T> Pivot<T>.max(separate: Boolean = false): DataRow<T> = max(separate, skipNaN = skipNaNDefault)
685685

686686
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
687-
public fun <T, R : Comparable<R & Any>?> Pivot<T>.maxFor(
687+
public fun <T, R : Comparable<*>?> Pivot<T>.maxFor(
688688
separate: Boolean = false,
689689
columns: ColumnsForAggregateSelector<T, R>,
690690
): DataRow<T> = maxFor(separate, skipNaN = skipNaNDefault, columns = columns)
@@ -695,14 +695,14 @@ public fun <T> Pivot<T>.maxFor(vararg columns: String, separate: Boolean = false
695695

696696
@AccessApiOverload
697697
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
698-
public fun <T, R : Comparable<R & Any>?> Pivot<T>.maxFor(
698+
public fun <T, R : Comparable<*>?> Pivot<T>.maxFor(
699699
vararg columns: ColumnReference<R>,
700700
separate: Boolean = false,
701701
): DataRow<T> = maxFor(columns = columns, separate = separate, skipNaN = skipNaNDefault)
702702

703703
@AccessApiOverload
704704
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
705-
public fun <T, R : Comparable<R & Any>?> Pivot<T>.maxFor(
705+
public fun <T, R : Comparable<*>?> Pivot<T>.maxFor(
706706
vararg columns: KProperty<R>,
707707
separate: Boolean = false,
708708
): DataRow<T> = maxFor(columns = columns, separate = separate, skipNaN = skipNaNDefault)
@@ -748,7 +748,7 @@ public inline fun <T, reified C : Comparable<C & Any>?> Pivot<T>.maxBy(column: K
748748
public fun <T> PivotGroupBy<T>.max(separate: Boolean = false): DataFrame<T> = max(separate, skipNaN = skipNaNDefault)
749749

750750
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
751-
public fun <T, R : Comparable<R & Any>?> PivotGroupBy<T>.maxFor(
751+
public fun <T, R : Comparable<*>?> PivotGroupBy<T>.maxFor(
752752
separate: Boolean = false,
753753
columns: ColumnsForAggregateSelector<T, R>,
754754
): DataFrame<T> = maxFor(separate, skipNaN = skipNaNDefault, columns = columns)
@@ -759,14 +759,14 @@ public fun <T> PivotGroupBy<T>.maxFor(vararg columns: String, separate: Boolean
759759

760760
@AccessApiOverload
761761
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
762-
public fun <T, R : Comparable<R & Any>?> PivotGroupBy<T>.maxFor(
762+
public fun <T, R : Comparable<*>?> PivotGroupBy<T>.maxFor(
763763
vararg columns: ColumnReference<R>,
764764
separate: Boolean = false,
765765
): DataFrame<T> = maxFor(columns = columns, separate = separate, skipNaN = skipNaNDefault)
766766

767767
@AccessApiOverload
768768
@Deprecated(MAX_NO_SKIPNAN, level = DeprecationLevel.HIDDEN)
769-
public fun <T, R : Comparable<R & Any>?> PivotGroupBy<T>.maxFor(
769+
public fun <T, R : Comparable<*>?> PivotGroupBy<T>.maxFor(
770770
vararg columns: KProperty<R>,
771771
separate: Boolean = false,
772772
): DataFrame<T> = maxFor(columns = columns, separate = separate, skipNaN = skipNaNDefault)

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -138,24 +138,24 @@ public fun <T> DataFrame<T>.median(skipNaN: Boolean = skipNaNDefault): DataRow<T
138138

139139
@Refine
140140
@Interpretable("Median1")
141-
public fun <T, C : Comparable<C & Any>?> DataFrame<T>.medianFor(
141+
public fun <T, C : Comparable<*>?> DataFrame<T>.medianFor(
142142
skipNaN: Boolean = skipNaNDefault,
143143
columns: ColumnsForAggregateSelector<T, C>,
144-
): DataRow<T> = Aggregators.medianCommon<C>(skipNaN).aggregateFor(this, columns)
144+
): DataRow<T> = Aggregators.median.invoke(skipNaN).aggregateFor(this, columns)
145145

146146
public fun <T> DataFrame<T>.medianFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow<T> =
147147
medianFor(skipNaN) { columns.toComparableColumns() }
148148

149149
@Deprecated(DEPRECATED_ACCESS_API)
150150
@AccessApiOverload
151-
public fun <T, C : Comparable<C & Any>?> DataFrame<T>.medianFor(
151+
public fun <T, C : Comparable<*>?> DataFrame<T>.medianFor(
152152
vararg columns: ColumnReference<C>,
153153
skipNaN: Boolean = skipNaNDefault,
154154
): DataRow<T> = medianFor(skipNaN) { columns.toColumnSet() }
155155

156156
@Deprecated(DEPRECATED_ACCESS_API)
157157
@AccessApiOverload
158-
public fun <T, C : Comparable<C & Any>?> DataFrame<T>.medianFor(
158+
public fun <T, C : Comparable<*>?> DataFrame<T>.medianFor(
159159
vararg columns: KProperty<C>,
160160
skipNaN: Boolean = skipNaNDefault,
161161
): DataRow<T> = medianFor(skipNaN) { columns.toColumnSet() }
@@ -329,23 +329,23 @@ public fun <T> Grouped<T>.median(skipNaN: Boolean = skipNaNDefault): DataFrame<T
329329

330330
@Refine
331331
@Interpretable("GroupByMedian0")
332-
public fun <T, C : Comparable<C & Any>?> Grouped<T>.medianFor(
332+
public fun <T, C : Comparable<*>?> Grouped<T>.medianFor(
333333
skipNaN: Boolean = skipNaNDefault,
334334
columns: ColumnsForAggregateSelector<T, C>,
335-
): DataFrame<T> = Aggregators.medianCommon<C>(skipNaN).aggregateFor(this, columns)
335+
): DataFrame<T> = Aggregators.median.invoke(skipNaN).aggregateFor(this, columns)
336336

337337
public fun <T> Grouped<T>.medianFor(vararg columns: String): DataFrame<T> = medianFor { columns.toComparableColumns() }
338338

339339
@Deprecated(DEPRECATED_ACCESS_API)
340340
@AccessApiOverload
341-
public fun <T, C : Comparable<C & Any>?> Grouped<T>.medianFor(
341+
public fun <T, C : Comparable<*>?> Grouped<T>.medianFor(
342342
vararg columns: ColumnReference<C>,
343343
skipNaN: Boolean = skipNaNDefault,
344344
): DataFrame<T> = medianFor(skipNaN) { columns.toColumnSet() }
345345

346346
@Deprecated(DEPRECATED_ACCESS_API)
347347
@AccessApiOverload
348-
public fun <T, C : Comparable<C & Any>?> Grouped<T>.medianFor(
348+
public fun <T, C : Comparable<*>?> Grouped<T>.medianFor(
349349
vararg columns: KProperty<C>,
350350
skipNaN: Boolean = skipNaNDefault,
351351
): DataFrame<T> = medianFor(skipNaN) { columns.toColumnSet() }
@@ -418,7 +418,7 @@ public inline fun <T, G, reified C : Comparable<C & Any>?> GroupBy<T, G>.medianB
418418
public fun <T> Pivot<T>.median(separate: Boolean = false, skipNaN: Boolean = skipNaNDefault): DataRow<T> =
419419
medianFor(separate, skipNaN, intraComparableColumns())
420420

421-
public fun <T, C : Comparable<C & Any>?> Pivot<T>.medianFor(
421+
public fun <T, C : Comparable<*>?> Pivot<T>.medianFor(
422422
separate: Boolean = false,
423423
skipNaN: Boolean = skipNaNDefault,
424424
columns: ColumnsForAggregateSelector<T, C>,
@@ -432,15 +432,15 @@ public fun <T> Pivot<T>.medianFor(
432432

433433
@Deprecated(DEPRECATED_ACCESS_API)
434434
@AccessApiOverload
435-
public fun <T, C : Comparable<C & Any>?> Pivot<T>.medianFor(
435+
public fun <T, C : Comparable<*>?> Pivot<T>.medianFor(
436436
vararg columns: ColumnReference<C>,
437437
separate: Boolean = false,
438438
skipNaN: Boolean = skipNaNDefault,
439439
): DataRow<T> = medianFor(separate, skipNaN) { columns.toColumnSet() }
440440

441441
@Deprecated(DEPRECATED_ACCESS_API)
442442
@AccessApiOverload
443-
public fun <T, C : Comparable<C & Any>?> Pivot<T>.medianFor(
443+
public fun <T, C : Comparable<*>?> Pivot<T>.medianFor(
444444
vararg columns: KProperty<C>,
445445
separate: Boolean = false,
446446
skipNaN: Boolean = skipNaNDefault,
@@ -501,11 +501,11 @@ public inline fun <T, reified C : Comparable<C & Any>?> Pivot<T>.medianBy(
501501
public fun <T> PivotGroupBy<T>.median(separate: Boolean = false, skipNaN: Boolean = skipNaNDefault): DataFrame<T> =
502502
medianFor(separate, skipNaN, intraComparableColumns())
503503

504-
public fun <T, C : Comparable<C & Any>?> PivotGroupBy<T>.medianFor(
504+
public fun <T, C : Comparable<*>?> PivotGroupBy<T>.medianFor(
505505
separate: Boolean = false,
506506
skipNaN: Boolean = skipNaNDefault,
507507
columns: ColumnsForAggregateSelector<T, C>,
508-
): DataFrame<T> = Aggregators.medianCommon<C>(skipNaN).aggregateFor(this, separate, columns)
508+
): DataFrame<T> = Aggregators.median.invoke(skipNaN).aggregateFor(this, separate, columns)
509509

510510
public fun <T> PivotGroupBy<T>.medianFor(
511511
vararg columns: String,
@@ -515,15 +515,15 @@ public fun <T> PivotGroupBy<T>.medianFor(
515515

516516
@Deprecated(DEPRECATED_ACCESS_API)
517517
@AccessApiOverload
518-
public fun <T, C : Comparable<C & Any>?> PivotGroupBy<T>.medianFor(
518+
public fun <T, C : Comparable<*>?> PivotGroupBy<T>.medianFor(
519519
vararg columns: ColumnReference<C>,
520520
separate: Boolean = false,
521521
skipNaN: Boolean = skipNaNDefault,
522522
): DataFrame<T> = medianFor(separate, skipNaN) { columns.toColumnSet() }
523523

524524
@Deprecated(DEPRECATED_ACCESS_API)
525525
@AccessApiOverload
526-
public fun <T, C : Comparable<C & Any>?> PivotGroupBy<T>.medianFor(
526+
public fun <T, C : Comparable<*>?> PivotGroupBy<T>.medianFor(
527527
vararg columns: KProperty<C>,
528528
separate: Boolean = false,
529529
skipNaN: Boolean = skipNaNDefault,

0 commit comments

Comments
 (0)