Skip to content

Commit 14b7321

Browse files
JolanrensenJolanrensen
committed
Merge branch 'master' into unified-numbers-json
# Conflicts: # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt
2 parents 6eb5bb8 + a728428 commit 14b7321

File tree

64 files changed

+2829
-417
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+2829
-417
lines changed

‎core/api/core.api‎

Lines changed: 14 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -6278,6 +6278,10 @@ public final class org/jetbrains/kotlinx/dataframe/api/MoveKt {
62786278
public static final fun moveTo (Lorg/jetbrains/kotlinx/dataframe/DataFrame;I[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
62796279
public static final fun moveTo (Lorg/jetbrains/kotlinx/dataframe/DataFrame;I[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
62806280
public static final fun moveTo (Lorg/jetbrains/kotlinx/dataframe/DataFrame;I[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6281+
public static final fun moveToEnd (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6282+
public static final fun moveToEnd (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6283+
public static final fun moveToEnd (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6284+
public static final fun moveToEnd (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
62816285
public static final fun moveToLeft (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
62826286
public static final fun moveToLeft (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
62836287
public static final fun moveToLeft (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
@@ -6286,9 +6290,15 @@ public final class org/jetbrains/kotlinx/dataframe/api/MoveKt {
62866290
public static final fun moveToRight (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
62876291
public static final fun moveToRight (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
62886292
public static final fun moveToRight (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6293+
public static final fun moveToStart (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6294+
public static final fun moveToStart (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6295+
public static final fun moveToStart (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6296+
public static final fun moveToStart (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
62896297
public static final fun to (Lorg/jetbrains/kotlinx/dataframe/api/MoveClause;I)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6298+
public static final fun toEnd (Lorg/jetbrains/kotlinx/dataframe/api/MoveClause;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
62906299
public static final fun toLeft (Lorg/jetbrains/kotlinx/dataframe/api/MoveClause;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
62916300
public static final fun toRight (Lorg/jetbrains/kotlinx/dataframe/api/MoveClause;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
6301+
public static final fun toStart (Lorg/jetbrains/kotlinx/dataframe/api/MoveClause;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
62926302
public static final fun toTop (Lorg/jetbrains/kotlinx/dataframe/api/MoveClause;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
62936303
public static synthetic fun toTop$default (Lorg/jetbrains/kotlinx/dataframe/api/MoveClause;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
62946304
public static final fun under (Lorg/jetbrains/kotlinx/dataframe/api/MoveClause;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
@@ -9545,11 +9555,6 @@ public final class org/jetbrains/kotlinx/dataframe/columns/SingleColumn$DefaultI
95459555
public static fun resolve (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnResolutionContext;)Ljava/util/List;
95469556
}
95479557

9548-
public final class org/jetbrains/kotlinx/dataframe/columns/SingleColumnKt {
9549-
public static final fun isSingleColumn (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Z
9550-
public static final fun isSingleColumnWithGroup (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;Ljava/util/List;)Z
9551-
}
9552-
95539558
public abstract interface class org/jetbrains/kotlinx/dataframe/columns/TypeSuggestion {
95549559
public static final field Companion Lorg/jetbrains/kotlinx/dataframe/columns/TypeSuggestion$Companion;
95559560
}
@@ -9941,8 +9946,6 @@ public final class org/jetbrains/kotlinx/dataframe/impl/UtilsKt {
99419946
public static final fun getColumnName (Lkotlin/reflect/KCallable;)Ljava/lang/String;
99429947
public static final fun getColumnName (Lkotlin/reflect/KFunction;)Ljava/lang/String;
99439948
public static final fun getColumnName (Lkotlin/reflect/KProperty;)Ljava/lang/String;
9944-
public static final fun getDELIMITED_STRING_REGEX ()Lkotlin/text/Regex;
9945-
public static final fun getDELIMITERS_REGEX ()Lkotlin/text/Regex;
99469949
public static final fun headPlusArray (B[B)[B
99479950
public static final fun headPlusArray (C[C)[C
99489951
public static final fun headPlusArray (D[D)[D
@@ -9951,7 +9954,8 @@ public final class org/jetbrains/kotlinx/dataframe/impl/UtilsKt {
99519954
public static final fun headPlusArray (J[J)[J
99529955
public static final fun headPlusArray (S[S)[S
99539956
public static final fun headPlusArray (Z[Z)[Z
9954-
public static final fun toCamelCaseByDelimiters (Ljava/lang/String;Lkotlin/text/Regex;)Ljava/lang/String;
9957+
public static final fun toCamelCaseByDelimiters (Ljava/lang/String;Lkotlin/text/Regex;Ljava/lang/String;)Ljava/lang/String;
9958+
public static synthetic fun toCamelCaseByDelimiters$default (Ljava/lang/String;Lkotlin/text/Regex;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
99559959
public static final fun zero (Lkotlin/reflect/KClass;)Ljava/lang/Number;
99569960
public static final fun zeroOrNull (Lkotlin/reflect/KClass;)Ljava/lang/Number;
99579961
}
@@ -10075,8 +10079,8 @@ public final class org/jetbrains/kotlinx/dataframe/impl/api/ToDataFrameKt {
1007510079
public static final fun createDataFrameImpl (Ljava/lang/Iterable;Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
1007610080
}
1007710081

10078-
public final class org/jetbrains/kotlinx/dataframe/impl/api/ToListKt {
10079-
public static final fun toListImpl (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/reflect/KType;)Ljava/util/List;
10082+
public final class org/jetbrains/kotlinx/dataframe/impl/api/ToSequenceKt {
10083+
public static final fun toSequenceImpl (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/reflect/KType;)Ljava/lang/Iterable;
1008010084
}
1008110085

1008210086
public final class org/jetbrains/kotlinx/dataframe/impl/api/UpdateKt {
@@ -10821,73 +10825,20 @@ public final class org/jetbrains/kotlinx/dataframe/jupyter/RenderedContent$Compa
1082110825
public final fun truncatedText (Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/jupyter/RenderedContent;
1082210826
}
1082310827

10824-
public final class org/jetbrains/kotlinx/dataframe/math/BasicStats {
10825-
public fun <init> (IDD)V
10826-
public final fun component1 ()I
10827-
public final fun component2 ()D
10828-
public final fun component3 ()D
10829-
public final fun copy (IDD)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
10830-
public static synthetic fun copy$default (Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;IDDILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
10831-
public fun equals (Ljava/lang/Object;)Z
10832-
public final fun getCount ()I
10833-
public final fun getMean ()D
10834-
public final fun getVariance ()D
10835-
public fun hashCode ()I
10836-
public final fun std (I)D
10837-
public fun toString ()Ljava/lang/String;
10838-
}
10839-
1084010828
public final class org/jetbrains/kotlinx/dataframe/math/MeanKt {
10841-
public static final fun bigDecimalMean (Ljava/lang/Iterable;)D
10842-
public static final fun bigIntegerMean (Ljava/lang/Iterable;)D
10843-
public static final fun byteMean (Ljava/lang/Iterable;)D
10844-
public static final fun doubleMean (Ljava/lang/Iterable;Z)D
10845-
public static synthetic fun doubleMean$default (Ljava/lang/Iterable;ZILjava/lang/Object;)D
10846-
public static final fun floatMean (Ljava/lang/Iterable;Z)D
10847-
public static synthetic fun floatMean$default (Ljava/lang/Iterable;ZILjava/lang/Object;)D
10848-
public static final fun intMean (Ljava/lang/Iterable;)D
10849-
public static final fun longMean (Ljava/lang/Iterable;)D
1085010829
public static final fun mean (Ljava/lang/Iterable;Lkotlin/reflect/KType;Z)D
10851-
public static final fun mean (Lkotlin/sequences/Sequence;Z)D
1085210830
public static synthetic fun mean$default (Ljava/lang/Iterable;Lkotlin/reflect/KType;ZILjava/lang/Object;)D
10853-
public static synthetic fun mean$default (Lkotlin/sequences/Sequence;ZILjava/lang/Object;)D
10854-
public static final fun meanFloat (Lkotlin/sequences/Sequence;Z)D
10855-
public static synthetic fun meanFloat$default (Lkotlin/sequences/Sequence;ZILjava/lang/Object;)D
10856-
public static final fun shortMean (Ljava/lang/Iterable;)D
1085710831
}
1085810832

1085910833
public final class org/jetbrains/kotlinx/dataframe/math/PercentileKt {
1086010834
public static final fun quickSelect (Ljava/util/List;I)Ljava/lang/Comparable;
1086110835
}
1086210836

1086310837
public final class org/jetbrains/kotlinx/dataframe/math/StdKt {
10864-
public static final fun bigDecimalStd (Ljava/lang/Iterable;I)D
10865-
public static synthetic fun bigDecimalStd$default (Ljava/lang/Iterable;IILjava/lang/Object;)D
10866-
public static final fun bigIntegerStd (Ljava/lang/Iterable;I)D
10867-
public static synthetic fun bigIntegerStd$default (Ljava/lang/Iterable;IILjava/lang/Object;)D
10868-
public static final fun doubleStd (Ljava/lang/Iterable;ZI)D
10869-
public static synthetic fun doubleStd$default (Ljava/lang/Iterable;ZIILjava/lang/Object;)D
10870-
public static final fun floatStd (Ljava/lang/Iterable;ZI)D
10871-
public static synthetic fun floatStd$default (Ljava/lang/Iterable;ZIILjava/lang/Object;)D
10872-
public static final fun intStd (Ljava/lang/Iterable;I)D
10873-
public static synthetic fun intStd$default (Ljava/lang/Iterable;IILjava/lang/Object;)D
10874-
public static final fun longStd (Ljava/lang/Iterable;I)D
10875-
public static synthetic fun longStd$default (Ljava/lang/Iterable;IILjava/lang/Object;)D
1087610838
public static final fun std (Ljava/lang/Iterable;Lkotlin/reflect/KType;ZI)D
1087710839
public static synthetic fun std$default (Ljava/lang/Iterable;Lkotlin/reflect/KType;ZIILjava/lang/Object;)D
1087810840
}
1087910841

10880-
public final class org/jetbrains/kotlinx/dataframe/math/StdMeanKt {
10881-
public static final fun bigDecimalVarianceAndMean (Ljava/lang/Iterable;)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
10882-
public static final fun bigIntegerVarianceAndMean (Ljava/lang/Iterable;)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
10883-
public static final fun doubleVarianceAndMean (Ljava/lang/Iterable;Z)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
10884-
public static synthetic fun doubleVarianceAndMean$default (Ljava/lang/Iterable;ZILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
10885-
public static final fun floatVarianceAndMean (Ljava/lang/Iterable;Z)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
10886-
public static synthetic fun floatVarianceAndMean$default (Ljava/lang/Iterable;ZILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
10887-
public static final fun intVarianceAndMean (Ljava/lang/Iterable;)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
10888-
public static final fun longVarianceAndMean (Ljava/lang/Iterable;)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
10889-
}
10890-
1089110842
public final class org/jetbrains/kotlinx/dataframe/math/SumKt {
1089210843
public static final fun sum (Ljava/lang/Iterable;)Ljava/math/BigDecimal;
1089310844
public static final fun sum (Ljava/lang/Iterable;)Ljava/math/BigInteger;

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnSet
1717
import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
1818
import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver
1919
import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
20-
import org.jetbrains.kotlinx.dataframe.columns.isSingleColumnWithGroup
2120
import org.jetbrains.kotlinx.dataframe.columns.size
2221
import org.jetbrains.kotlinx.dataframe.columns.values
2322
import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet
@@ -8052,22 +8051,24 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
80528051
}
80538052

80548053
/**
8055-
* If [this] is a [SingleColumn] containing a single [ColumnGroup], it
8054+
* If [this] is a [SingleColumn] containing a single [ColumnGroup]
8055+
* (like [SingleColumn][SingleColumn]`<`[AnyRow][AnyRow]`>` or [ColumnsSelectionDsl][ColumnsSelectionDsl]), it
80568056
* returns a [(transformable) ColumnSet][TransformableColumnSet] containing the children of this [ColumnGroup],
8057-
* else it simply returns a [(transformable) ColumnSet][TransformableColumnSet] from [this].
8057+
* else it simply returns a [(transformable) ColumnSet][TransformableColumnSet] from [this]
8058+
* (like when [this] is a [ColumnSet]).
80588059
*/
80598060
internal fun ColumnsResolver<*>.allColumnsInternal(removePaths: Boolean = false): TransformableColumnSet<*> =
8060-
transform {
8061-
if (isSingleColumnWithGroup(it)) {
8062-
it.single().let {
8061+
transform { cols ->
8062+
if (this is SingleColumn<*> && cols.singleOrNull()?.isColumnGroup() == true) {
8063+
cols.single().let {
80638064
if (removePaths) {
80648065
it.asColumnGroup().columns().map(AnyCol::addPath)
80658066
} else {
80668067
it.cols()
80678068
}
80688069
}
80698070
} else {
8070-
it
8071+
cols
80718072
}
80728073
}
80738074

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOf
1919
import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.of
2020
import org.jetbrains.kotlinx.dataframe.impl.columns.toComparableColumns
2121
import org.jetbrains.kotlinx.dataframe.impl.suggestIfNull
22-
import org.jetbrains.kotlinx.dataframe.math.medianOrNull
22+
import org.jetbrains.kotlinx.dataframe.math.median
2323
import kotlin.reflect.KProperty
2424

2525
// region DataColumn
@@ -45,7 +45,7 @@ public fun AnyRow.rowMedianOrNull(): Any? =
4545

4646
public fun AnyRow.rowMedian(): Any = rowMedianOrNull().suggestIfNull("rowMedian")
4747

48-
public inline fun <reified T : Comparable<T>> AnyRow.rowMedianOfOrNull(): T? = valuesOf<T>().medianOrNull()
48+
public inline fun <reified T : Comparable<T>> AnyRow.rowMedianOfOrNull(): T? = valuesOf<T>().median()
4949

5050
public inline fun <reified T : Comparable<T>> AnyRow.rowMedianOf(): T =
5151
rowMedianOfOrNull<T>().suggestIfNull("rowMedianOf")
@@ -82,6 +82,7 @@ public fun <T, C : Comparable<C>> DataFrame<T>.median(vararg columns: ColumnRefe
8282
public fun <T, C : Comparable<C>> DataFrame<T>.median(vararg columns: KProperty<C?>): C =
8383
median { columns.toColumnSet() }
8484

85+
@Suppress("UNCHECKED_CAST")
8586
public fun <T, C : Comparable<C>> DataFrame<T>.medianOrNull(columns: ColumnsSelector<T, C?>): C? =
8687
Aggregators.median.aggregateAll(this, columns) as C?
8788

0 commit comments

Comments
 (0)