stuck on issue KT-76683

Author: Jolanrensen

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

@@ -65,21 +65,29 @@ public inline fun <T, reified R : Comparable<R & Any>?> DataColumn<T>.medianByOr
     crossinline selector: (T) -> R,
 ): T? = Aggregators.medianCommon<R>(skipNaN).aggregateByOrNull(this, selector)
 
+// todo check overload resolution https://youtrack.jetbrains.com/issue/KT-76683
+@OverloadResolutionByLambdaReturnType
 public inline fun <T, reified R : Comparable<R & Any>?> DataColumn<T>.medianOf(
     crossinline expression: (T) -> R,
 ): R & Any = medianOfOrNull(expression).suggestIfNull("medianOf")
 
+// todo check overload resolution https://youtrack.jetbrains.com/issue/KT-76683
+@OverloadResolutionByLambdaReturnType
 public inline fun <T, reified R : Comparable<R & Any>?> DataColumn<T>.medianOfOrNull(
     crossinline expression: (T) -> R,
 ): R? = Aggregators.medianComparables<R>().aggregateOf(this, expression)
 
+// todo check overload resolution https://youtrack.jetbrains.com/issue/KT-76683
+@OverloadResolutionByLambdaReturnType
 public inline fun <T, reified R> DataColumn<T>.medianOf(
     skipNaN: Boolean = skipNaNDefault,
     crossinline expression: (T) -> R,
 ): Double
     where R : Comparable<R & Any>?, R : Number? =
     medianOfOrNull(skipNaN, expression).suggestIfNull("medianOf")
 
+// todo check overload resolution https://youtrack.jetbrains.com/issue/KT-76683
+@OverloadResolutionByLambdaReturnType
 public inline fun <T, reified R> DataColumn<T>.medianOfOrNull(
     skipNaN: Boolean = skipNaNDefault,
     crossinline expression: (T) -> R,
@@ -146,6 +154,7 @@ public fun <T, C : Comparable<C & Any>?> DataFrame<T>.medianFor(
 public fun <T, C : Comparable<C & Any>?> DataFrame<T>.median(columns: ColumnsSelector<T, C>): C & Any =
     medianOrNull(columns).suggestIfNull("median")
 
+// todo check overload resolution https://youtrack.jetbrains.com/issue/KT-76683
 @OverloadResolutionByLambdaReturnType
 @Suppress("UNCHECKED_CAST")
 public fun <T, C : Comparable<C & Any>?> DataFrame<T>.medianOrNull(columns: ColumnsSelector<T, C>): C? =
@@ -159,6 +168,7 @@ public fun <T, C> DataFrame<T>.median(
 ): Double
     where C : Number?, C : Comparable<C & Any>? = medianOrNull(skipNaN, columns).suggestIfNull("median")
 
+// todo check overload resolution https://youtrack.jetbrains.com/issue/KT-76683
 @OverloadResolutionByLambdaReturnType
 @Suppress("UNCHECKED_CAST")
 public fun <T, C> DataFrame<T>.medianOrNull(
@@ -220,16 +230,19 @@ public fun <T, C> DataFrame<T>.medianOrNull(
 ): Double?
     where C : Comparable<C & Any>?, C : Number? = medianOrNull(skipNaN) { columns.toColumnSet() }
 
+// todo check overload resolution https://youtrack.jetbrains.com/issue/KT-76683
 @OverloadResolutionByLambdaReturnType
 public inline fun <T, reified R : Comparable<R & Any>?> DataFrame<T>.medianOf(
     crossinline expression: RowExpression<T, R>,
 ): R & Any = medianOfOrNull(expression).suggestIfNull("medianOf")
 
+// todo check overload resolution https://youtrack.jetbrains.com/issue/KT-76683
 @OverloadResolutionByLambdaReturnType
 public inline fun <T, reified R : Comparable<R & Any>?> DataFrame<T>.medianOfOrNull(
     crossinline expression: RowExpression<T, R>,
 ): R? = Aggregators.medianComparables<R>().aggregateOf(this, expression)
 
+// todo check overload resolution https://youtrack.jetbrains.com/issue/KT-76683
 @OverloadResolutionByLambdaReturnType
 public inline fun <T, reified R> DataFrame<T>.medianOf(
     skipNaN: Boolean = skipNaNDefault,
@@ -238,6 +251,7 @@ public inline fun <T, reified R> DataFrame<T>.medianOf(
     where R : Comparable<R & Any>?, R : Number? =
     medianOfOrNull(skipNaN, expression).suggestIfNull("medianOf")
 
+// todo check overload resolution https://youtrack.jetbrains.com/issue/KT-76683
 @OverloadResolutionByLambdaReturnType
 public inline fun <T, reified R> DataFrame<T>.medianOfOrNull(
     skipNaN: Boolean = skipNaNDefault,

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/statistics/median.kt

@@ -1,13 +1,17 @@
+@file:OptIn(ExperimentalTypeInference::class)
+
 package org.jetbrains.kotlinx.dataframe.statistics
 
 import io.kotest.matchers.shouldBe
 import org.jetbrains.kotlinx.dataframe.api.Infer
+import org.jetbrains.kotlinx.dataframe.api.column
 import org.jetbrains.kotlinx.dataframe.api.columnOf
 import org.jetbrains.kotlinx.dataframe.api.dataFrameOf
 import org.jetbrains.kotlinx.dataframe.api.groupBy
 import org.jetbrains.kotlinx.dataframe.api.mapToColumn
 import org.jetbrains.kotlinx.dataframe.api.median
 import org.jetbrains.kotlinx.dataframe.api.medianOf
+import org.jetbrains.kotlinx.dataframe.api.medianOrNull
 import org.jetbrains.kotlinx.dataframe.api.rowMedianOf
 import org.jetbrains.kotlinx.dataframe.statistics.myFun
 import org.junit.Test
@@ -34,6 +38,12 @@ class MedianTests {
     fun `medianOf test`() {
         val d = personsDf.groupBy("city").medianOf("newAge") { "age"<Int>() * 10 }
         d["newAge"].type() shouldBe typeOf<Int>()
+
+        val e = personsDf.medianOf("newAge") { "age"<Int>().toString() }
+
+        val column = personsDf[column<Int>("age")]
+        column.medianOf { it }
+        column.medianOf { it.toString() }
     }
 
     @Test
@@ -45,12 +55,16 @@ class MedianTests {
         )
         df.median("a", "b") shouldBe 5.0
         df.median { "a"<Int>() and "b"<Int>() } shouldBe 5.0
+        df.medianOrNull { "a"<Int>() and "b"<Int>() } shouldBe 5.0
         df.median("c") shouldBe "b"
 
         df.median { "c"<String>() } shouldBe "b"
+        df.medianOrNull { "c"<String>() } shouldBe "b"
 
         df.median({ "c"<String>() }) shouldBe "b"
+        df.medianOrNull({ "c"<String>() }) shouldBe "b"
         df.median<_, String> { "c"<String>() } shouldBe "b"
+        df.medianOrNull<_, String> { "c"<String>() } shouldBe "b"
     }
 
     @Test
@@ -63,31 +77,3 @@ class MedianTests {
         df.mapToColumn("", Infer.Type) { it.rowMedianOf<Int>() } shouldBe columnOf(2, 3, 7)
     }
 }
-
-fun <T> List<T>.myFun(): Int where T : Comparable<T> = TODO()
-fun <T> List<T>.myFun(): Double where T : Comparable<T>, T : Number = TODO()
-
-fun <T> myFun(list: List<T>): Int where T : Comparable<T> = TODO()
-fun <T> myFun(list: List<T>): Double where T : Comparable<T>, T : Number = TODO()
-
-@OptIn(ExperimentalTypeInference::class)
-@OverloadResolutionByLambdaReturnType
-//@JvmName("jnkjsdnf")
-fun <T> myFun(get : () -> T): Int where T : Comparable<T> = TODO()
-
-@JvmName("jnkjsdnf")
-@OptIn(ExperimentalTypeInference::class)
-@OverloadResolutionByLambdaReturnType
-fun <T> myFun(get : () -> T): Double where T : Comparable<T>, T : Number = TODO()
-
-fun main() {
-val res1 = listOf(1, 2, 3).myFun()
-val res2 = listOf("a", "b", "c").myFun()
-
-val res3 = myFun(listOf(1, 2, 3))
-val res4 = myFun(listOf("a", "b", "c"))
-
-val res5 = myFun { 1 }
-val res6 = myFun { "" }
-val res7 = myFun<String> { "" }
-}