11package org.jetbrains.kotlinx.dataframe.api
22
33import org.jetbrains.kotlinx.dataframe.AnyColumnReference
4- import org.jetbrains.kotlinx.dataframe.ColumnsSelector
54import org.jetbrains.kotlinx.dataframe.DataFrame
65import org.jetbrains.kotlinx.dataframe.DataRow
76import org.jetbrains.kotlinx.dataframe.Selector
@@ -77,7 +76,7 @@ public fun <T> DataFrame<T>.pivot(vararg columns: KProperty<*>, inward: Boolean?
7776
7877// region pivotMatches
7978
80- public fun <T > DataFrame<T>.pivotMatches (inward : Boolean = true, columns : ColumnsSelector <T , * >): DataFrame <T > =
79+ public fun <T > DataFrame<T>.pivotMatches (inward : Boolean = true, columns : PivotColumnsSelector <T , * >): DataFrame <T > =
8180 pivot(inward, columns).groupByOther().matches()
8281
8382public fun <T > DataFrame<T>.pivotMatches (vararg columns : String , inward : Boolean = true): DataFrame <T > =
@@ -97,7 +96,7 @@ public fun <T> DataFrame<T>.pivotMatches(vararg columns: KProperty<*>, inward: B
9796
9897// region pivotCounts
9998
100- public fun <T > DataFrame<T>.pivotCounts (inward : Boolean = true, columns : ColumnsSelector <T , * >): DataFrame <T > =
99+ public fun <T > DataFrame<T>.pivotCounts (inward : Boolean = true, columns : PivotColumnsSelector <T , * >): DataFrame <T > =
101100 pivot(inward, columns).groupByOther().count()
102101
103102public fun <T > DataFrame<T>.pivotCounts (vararg columns : String , inward : Boolean = true): DataFrame <T > =
@@ -121,7 +120,7 @@ public fun <T> DataFrame<T>.pivotCounts(vararg columns: KProperty<*>, inward: Bo
121120
122121// region pivot
123122
124- public fun <G > GroupBy <* , G >.pivot (inward : Boolean = true, columns : ColumnsSelector <G , * >): PivotGroupBy <G > =
123+ public fun <G > GroupBy <* , G >.pivot (inward : Boolean = true, columns : PivotColumnsSelector <G , * >): PivotGroupBy <G > =
125124 PivotGroupByImpl (this , columns, inward)
126125
127126@Deprecated(DEPRECATED_ACCESS_API )
@@ -141,7 +140,7 @@ public fun <G> GroupBy<*, G>.pivot(vararg columns: KProperty<*>, inward: Boolean
141140
142141// region pivotMatches
143142
144- public fun <G > GroupBy <* , G >.pivotMatches (inward : Boolean = true, columns : ColumnsSelector <G , * >): DataFrame <G > =
143+ public fun <G > GroupBy <* , G >.pivotMatches (inward : Boolean = true, columns : PivotColumnsSelector <G , * >): DataFrame <G > =
145144 pivot(inward, columns).matches()
146145
147146public fun <G > GroupBy <* , G >.pivotMatches (vararg columns : String , inward : Boolean = true): DataFrame <G > =
@@ -161,7 +160,7 @@ public fun <G> GroupBy<*, G>.pivotMatches(vararg columns: KProperty<*>, inward:
161160
162161// region pivotCounts
163162
164- public fun <G > GroupBy <* , G >.pivotCounts (inward : Boolean = true, columns : ColumnsSelector <G , * >): DataFrame <G > =
163+ public fun <G > GroupBy <* , G >.pivotCounts (inward : Boolean = true, columns : PivotColumnsSelector <G , * >): DataFrame <G > =
165164 pivot(inward, columns).count()
166165
167166public fun <G > GroupBy <* , G >.pivotCounts (vararg columns : String , inward : Boolean = true): DataFrame <G > =
@@ -211,7 +210,7 @@ public fun <T> AggregateGroupedDsl<T>.pivot(vararg columns: KProperty<*>, inward
211210
212211public fun <T > AggregateGroupedDsl<T>.pivotMatches (
213212 inward : Boolean = true,
214- columns : ColumnsSelector <T , * >,
213+ columns : PivotColumnsSelector <T , * >,
215214): DataFrame <T > = pivot(inward, columns).matches()
216215
217216public fun <T > AggregateGroupedDsl<T>.pivotMatches (vararg columns : String , inward : Boolean = true): DataFrame <T > =
@@ -235,7 +234,7 @@ public fun <T> AggregateGroupedDsl<T>.pivotMatches(vararg columns: KProperty<*>,
235234
236235public fun <T > AggregateGroupedDsl<T>.pivotCounts (
237236 inward : Boolean = true,
238- columns : ColumnsSelector <T , * >,
237+ columns : PivotColumnsSelector <T , * >,
239238): DataFrame <T > = pivot(inward, columns).matches()
240239
241240public fun <T > AggregateGroupedDsl<T>.pivotCounts (vararg columns : String , inward : Boolean = true): DataFrame <T > =
0 commit comments