Skip to content

Commit b610742

Browse files
JolanrensenJolanrensen
committed
Merge branch 'master' into kproperties-columnsSelectionDsl
# Conflicts: # core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt
2 parents c932196 + cb884c8 commit b610742

File tree

121 files changed

+2935
-1485
lines changed

Some content is hidden

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

121 files changed

+2935
-1485
lines changed

‎.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ env:
1111
PRODUCT: StardustDocs/d
1212
ARTIFACT: webHelpD2-all.zip
1313
ALGOLIA_ARTIFACT: algolia-indexes-D.zip
14-
ALGOLIA_APP_NAME: OHIV241QET
15-
ALGOLIA_INDEX_NAME: prod_JETBRAINSCOM_HELP
14+
ALGOLIA_APP_NAME: JWPLKSKZVF
15+
ALGOLIA_INDEX_NAME: prod_DATAFRAME_HELP
1616
ALGOLIA_KEY: ${{ secrets.ALGOLIA_KEY }}
1717
CONFIG_JSON_PRODUCT: Dataframe
1818
CONFIG_JSON_VERSION: 0.9

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import org.jetbrains.kotlinx.dataframe.api.rows
1010
import org.jetbrains.kotlinx.dataframe.api.select
1111
import org.jetbrains.kotlinx.dataframe.api.toDataFrame
1212
import org.jetbrains.kotlinx.dataframe.columns.UnresolvedColumnsPolicy
13+
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
1314
import org.jetbrains.kotlinx.dataframe.impl.DataFrameImpl
1415
import org.jetbrains.kotlinx.dataframe.impl.DataFrameSize
1516
import org.jetbrains.kotlinx.dataframe.impl.getColumnsImpl
@@ -57,8 +58,12 @@ public interface DataFrame<out T> : Aggregatable<T>, ColumnsContainer<T> {
5758
override operator fun <C> get(columns: ColumnsSelector<T, C>): List<DataColumn<C>> =
5859
getColumnsImpl(UnresolvedColumnsPolicy.Fail, columns)
5960

60-
public operator fun get(first: AnyColumnReference, vararg other: AnyColumnReference): DataFrame<T> = select(listOf(first) + other)
61-
public operator fun get(first: String, vararg other: String): DataFrame<T> = select(listOf(first) + other)
61+
public operator fun get(first: AnyColumnReference, vararg other: AnyColumnReference): DataFrame<T> =
62+
select { (listOf(first) + other).toColumnSet() }
63+
64+
public operator fun get(first: String, vararg other: String): DataFrame<T> =
65+
select { (listOf(first) + other).toColumnSet() }
66+
6267
public operator fun get(columnRange: ClosedRange<String>): DataFrame<T> =
6368
select { columnRange.start..columnRange.endInclusive }
6469

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

Lines changed: 20 additions & 128 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
1414
import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
1515
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
1616
import org.jetbrains.kotlinx.dataframe.columns.UnresolvedColumnsPolicy
17+
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
1718
import org.jetbrains.kotlinx.dataframe.impl.columnName
1819
import org.jetbrains.kotlinx.dataframe.impl.columns.asAnyFrameColumn
19-
import org.jetbrains.kotlinx.dataframe.impl.columns.toColumns
2020
import org.jetbrains.kotlinx.dataframe.impl.getColumnPaths
2121
import org.jetbrains.kotlinx.dataframe.impl.getColumnsWithPaths
2222
import org.jetbrains.kotlinx.dataframe.ncol
@@ -32,7 +32,7 @@ public fun <T, C> DataFrame<T>.getColumnPaths(selector: ColumnsSelector<T, C>):
3232

3333
public fun <T, C> DataFrame<T>.getColumnWithPath(selector: ColumnSelector<T, C>): ColumnWithPath<C> = getColumnsWithPaths(selector).single()
3434
public fun <T, C> DataFrame<T>.getColumns(selector: ColumnsSelector<T, C>): List<DataColumn<C>> = get(selector)
35-
public fun <T> DataFrame<T>.getColumns(vararg columns: String): List<AnyCol> = getColumns { columns.toColumns() }
35+
public fun <T> DataFrame<T>.getColumns(vararg columns: String): List<AnyCol> = getColumns { columns.toColumnSet() }
3636

3737
public fun <T> DataFrame<T>.getColumnIndex(col: AnyCol): Int = getColumnIndex(col.name())
3838
public fun <T> DataFrame<T>.getRows(range: IntRange): DataFrame<T> = if (range == indices()) this else columns().map { col -> col[range] }.toDataFrame().cast()

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

Lines changed: 68 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import org.jetbrains.kotlinx.dataframe.*
44
import org.jetbrains.kotlinx.dataframe.api.Update.UpdateOperationArg
55
import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
66
import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
7+
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
78
import org.jetbrains.kotlinx.dataframe.documentation.*
8-
import org.jetbrains.kotlinx.dataframe.impl.columns.toColumnSet
9-
import org.jetbrains.kotlinx.dataframe.impl.columns.toColumns
9+
import org.jetbrains.kotlinx.dataframe.util.ITERABLE_COLUMNS_DEPRECATION_MESSAGE
1010
import kotlin.reflect.KProperty
1111

1212
// region fillNulls
@@ -120,7 +120,7 @@ public fun <T, C> DataFrame<T>.fillNulls(columns: ColumnsSelector<T, C?>): Updat
120120
* @param columns The [Column names][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.ColumnNames.WithExample] belonging to this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update.
121121
*/
122122
public fun <T> DataFrame<T>.fillNulls(vararg columns: String): Update<T, Any?> =
123-
fillNulls { columns.toColumns() }
123+
fillNulls { columns.toColumnSet() }
124124

125125
/**
126126
* ## The Fill Nulls Operation
@@ -148,7 +148,7 @@ public fun <T> DataFrame<T>.fillNulls(vararg columns: String): Update<T, Any?> =
148148
* @param columns The [KProperties][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.KProperties.WithExample] corresponding to columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update.
149149
*/
150150
public fun <T, C> DataFrame<T>.fillNulls(vararg columns: KProperty<C>): Update<T, C?> =
151-
fillNulls { columns.toColumns() }
151+
fillNulls { columns.toColumnSet() }
152152

153153
/**
154154
* ## The Fill Nulls Operation
@@ -178,11 +178,16 @@ public fun <T, C> DataFrame<T>.fillNulls(vararg columns: KProperty<C>): Update<T
178178
* @param columns The [Column references][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.ColumnAccessors.WithExample] of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update.
179179
*/
180180
public fun <T, C> DataFrame<T>.fillNulls(vararg columns: ColumnReference<C>): Update<T, C?> =
181-
fillNulls { columns.toColumns() }
181+
fillNulls { columns.toColumnSet() }
182182

183-
/**
184-
* TODO this will be deprecated [PR #286](https://github.com/Kotlin/dataframe/pull/320)
185-
*/
183+
@Deprecated(
184+
message = ITERABLE_COLUMNS_DEPRECATION_MESSAGE,
185+
replaceWith = ReplaceWith(
186+
"fillNulls { columns.toColumnSet() }",
187+
"org.jetbrains.kotlinx.dataframe.columns.toColumnSet",
188+
),
189+
level = DeprecationLevel.ERROR,
190+
)
186191
public fun <T, C> DataFrame<T>.fillNulls(columns: Iterable<ColumnReference<C>>): Update<T, C?> =
187192
fillNulls { columns.toColumnSet() }
188193

@@ -313,7 +318,7 @@ public fun <T, C> DataFrame<T>.fillNaNs(columns: ColumnsSelector<T, C>): Update<
313318
* @param columns The [Column names][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.ColumnNames.WithExample] belonging to this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update.
314319
*/
315320
public fun <T> DataFrame<T>.fillNaNs(vararg columns: String): Update<T, Any?> =
316-
fillNaNs { columns.toColumns() }
321+
fillNaNs { columns.toColumnSet() }
317322

318323
/**
319324
* ## The Fill NaNs Operation
@@ -339,7 +344,7 @@ public fun <T> DataFrame<T>.fillNaNs(vararg columns: String): Update<T, Any?> =
339344
* @param columns The [KProperties][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.KProperties.WithExample] corresponding to columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update.
340345
*/
341346
public fun <T, C> DataFrame<T>.fillNaNs(vararg columns: KProperty<C>): Update<T, C> =
342-
fillNaNs { columns.toColumns() }
347+
fillNaNs { columns.toColumnSet() }
343348

344349
/**
345350
* ## The Fill NaNs Operation
@@ -367,11 +372,16 @@ public fun <T, C> DataFrame<T>.fillNaNs(vararg columns: KProperty<C>): Update<T,
367372
* @param columns The [Column references][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.ColumnAccessors.WithExample] of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update.
368373
*/
369374
public fun <T, C> DataFrame<T>.fillNaNs(vararg columns: ColumnReference<C>): Update<T, C> =
370-
fillNaNs { columns.toColumns() }
375+
fillNaNs { columns.toColumnSet() }
371376

372-
/**
373-
* TODO this will be deprecated [PR #286](https://github.com/Kotlin/dataframe/pull/320)
374-
*/
377+
@Deprecated(
378+
message = ITERABLE_COLUMNS_DEPRECATION_MESSAGE,
379+
replaceWith = ReplaceWith(
380+
"fillNaNs { columns.toColumnSet() }",
381+
"org.jetbrains.kotlinx.dataframe.columns.toColumnSet",
382+
),
383+
level = DeprecationLevel.ERROR,
384+
)
375385
public fun <T, C> DataFrame<T>.fillNaNs(columns: Iterable<ColumnReference<C>>): Update<T, C> =
376386
fillNaNs { columns.toColumnSet() }
377387

@@ -482,7 +492,7 @@ public fun <T, C> DataFrame<T>.fillNA(columns: ColumnsSelector<T, C?>): Update<T
482492
* @param columns The [Column names][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.ColumnNames.WithExample] belonging to this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update.
483493
*/
484494
public fun <T> DataFrame<T>.fillNA(vararg columns: String): Update<T, Any?> =
485-
fillNA { columns.toColumns() }
495+
fillNA { columns.toColumnSet() }
486496

487497
/**
488498
* ## The Fill NA Operation
@@ -508,7 +518,7 @@ public fun <T> DataFrame<T>.fillNA(vararg columns: String): Update<T, Any?> =
508518
* @param columns The [KProperties][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.KProperties.WithExample] corresponding to columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update.
509519
*/
510520
public fun <T, C> DataFrame<T>.fillNA(vararg columns: KProperty<C>): Update<T, C?> =
511-
fillNA { columns.toColumns() }
521+
fillNA { columns.toColumnSet() }
512522

513523
/**
514524
* ## The Fill NA Operation
@@ -536,11 +546,16 @@ public fun <T, C> DataFrame<T>.fillNA(vararg columns: KProperty<C>): Update<T, C
536546
* @param columns The [Column references][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.ColumnAccessors.WithExample] of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update.
537547
*/
538548
public fun <T, C> DataFrame<T>.fillNA(vararg columns: ColumnReference<C>): Update<T, C?> =
539-
fillNA { columns.toColumns() }
549+
fillNA { columns.toColumnSet() }
540550

541-
/**
542-
* TODO this will be deprecated [PR #286](https://github.com/Kotlin/dataframe/pull/320)
543-
*/
551+
@Deprecated(
552+
message = ITERABLE_COLUMNS_DEPRECATION_MESSAGE,
553+
replaceWith = ReplaceWith(
554+
"fillNA { columns.toColumnSet() }",
555+
"org.jetbrains.kotlinx.dataframe.columns.toColumnSet",
556+
),
557+
level = DeprecationLevel.ERROR,
558+
)
544559
public fun <T, C> DataFrame<T>.fillNA(columns: Iterable<ColumnReference<C>>): Update<T, C?> =
545560
fillNA { columns.toColumnSet() }
546561

@@ -682,7 +697,7 @@ public fun <T> DataFrame<T>.dropNulls(whereAllNull: Boolean = false): DataFrame<
682697
* @param columns The [KProperties][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.KProperties.WithExample] used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in.
683698
*/
684699
public fun <T> DataFrame<T>.dropNulls(vararg columns: KProperty<*>, whereAllNull: Boolean = false): DataFrame<T> =
685-
dropNulls(whereAllNull) { columns.toColumns() }
700+
dropNulls(whereAllNull) { columns.toColumnSet() }
686701

687702
/**
688703
* ## The Drop Nulls Operation
@@ -709,7 +724,7 @@ public fun <T> DataFrame<T>.dropNulls(vararg columns: KProperty<*>, whereAllNull
709724
* @param columns The [Column names][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.ColumnNames.WithExample] used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in.
710725
*/
711726
public fun <T> DataFrame<T>.dropNulls(vararg columns: String, whereAllNull: Boolean = false): DataFrame<T> =
712-
dropNulls(whereAllNull) { columns.toColumns() }
727+
dropNulls(whereAllNull) { columns.toColumnSet() }
713728

714729
/**
715730
* ## The Drop Nulls Operation
@@ -741,11 +756,16 @@ public fun <T> DataFrame<T>.dropNulls(vararg columns: String, whereAllNull: Bool
741756
* ([Column Accessors API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi.ColumnAccessorsApi]). used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in.
742757
*/
743758
public fun <T> DataFrame<T>.dropNulls(vararg columns: AnyColumnReference, whereAllNull: Boolean = false): DataFrame<T> =
744-
dropNulls(whereAllNull) { columns.toColumns() }
759+
dropNulls(whereAllNull) { columns.toColumnSet() }
745760

746-
/**
747-
* TODO this will be deprecated [PR #286](https://github.com/Kotlin/dataframe/pull/320)
748-
*/
761+
@Deprecated(
762+
message = ITERABLE_COLUMNS_DEPRECATION_MESSAGE,
763+
replaceWith = ReplaceWith(
764+
"dropNulls(whereAllNull) { columns.toColumnSet() }",
765+
"org.jetbrains.kotlinx.dataframe.columns.toColumnSet",
766+
),
767+
level = DeprecationLevel.ERROR,
768+
)
749769
public fun <T> DataFrame<T>.dropNulls(
750770
columns: Iterable<AnyColumnReference>,
751771
whereAllNull: Boolean = false,
@@ -866,7 +886,7 @@ public fun <T> DataFrame<T>.dropNA(whereAllNA: Boolean = false, columns: Columns
866886
* @param columns The [KProperties][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.KProperties.WithExample] used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in.
867887
*/
868888
public fun <T> DataFrame<T>.dropNA(vararg columns: KProperty<*>, whereAllNA: Boolean = false): DataFrame<T> =
869-
dropNA(whereAllNA) { columns.toColumns() }
889+
dropNA(whereAllNA) { columns.toColumnSet() }
870890

871891
/**
872892
* ## The Drop `NA` Operation
@@ -893,7 +913,7 @@ public fun <T> DataFrame<T>.dropNA(vararg columns: KProperty<*>, whereAllNA: Boo
893913
* @param columns The [Column names][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.ColumnNames.WithExample] used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in.
894914
*/
895915
public fun <T> DataFrame<T>.dropNA(vararg columns: String, whereAllNA: Boolean = false): DataFrame<T> =
896-
dropNA(whereAllNA) { columns.toColumns() }
916+
dropNA(whereAllNA) { columns.toColumnSet() }
897917

898918
/**
899919
* ## The Drop `NA` Operation
@@ -925,11 +945,16 @@ public fun <T> DataFrame<T>.dropNA(vararg columns: String, whereAllNA: Boolean =
925945
* ([Column Accessors API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi.ColumnAccessorsApi]). used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in.
926946
*/
927947
public fun <T> DataFrame<T>.dropNA(vararg columns: AnyColumnReference, whereAllNA: Boolean = false): DataFrame<T> =
928-
dropNA(whereAllNA) { columns.toColumns() }
948+
dropNA(whereAllNA) { columns.toColumnSet() }
929949

930-
/**
931-
* TODO this will be deprecated [PR #286](https://github.com/Kotlin/dataframe/pull/320)
932-
*/
950+
@Deprecated(
951+
message = ITERABLE_COLUMNS_DEPRECATION_MESSAGE,
952+
replaceWith = ReplaceWith(
953+
"dropNA(whereAllNA) { columns.toColumnSet() }",
954+
"org.jetbrains.kotlinx.dataframe.columns.toColumnSet",
955+
),
956+
level = DeprecationLevel.ERROR,
957+
)
933958
public fun <T> DataFrame<T>.dropNA(columns: Iterable<AnyColumnReference>, whereAllNA: Boolean = false): DataFrame<T> =
934959
dropNA(whereAllNA) { columns.toColumnSet() }
935960

@@ -1069,7 +1094,7 @@ public fun <T> DataFrame<T>.dropNaNs(whereAllNaN: Boolean = false, columns: Colu
10691094
* @param columns The [KProperties][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.KProperties.WithExample] used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in.
10701095
*/
10711096
public fun <T> DataFrame<T>.dropNaNs(vararg columns: KProperty<*>, whereAllNaN: Boolean = false): DataFrame<T> =
1072-
dropNaNs(whereAllNaN) { columns.toColumns() }
1097+
dropNaNs(whereAllNaN) { columns.toColumnSet() }
10731098

10741099
/**
10751100
* ## The Drop `NaN` Operation
@@ -1096,7 +1121,7 @@ public fun <T> DataFrame<T>.dropNaNs(vararg columns: KProperty<*>, whereAllNaN:
10961121
* @param columns The [Column names][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns.ColumnNames.WithExample] used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in.
10971122
*/
10981123
public fun <T> DataFrame<T>.dropNaNs(vararg columns: String, whereAllNaN: Boolean = false): DataFrame<T> =
1099-
dropNaNs(whereAllNaN) { columns.toColumns() }
1124+
dropNaNs(whereAllNaN) { columns.toColumnSet() }
11001125

11011126
/**
11021127
* ## The Drop `NaN` Operation
@@ -1128,11 +1153,16 @@ public fun <T> DataFrame<T>.dropNaNs(vararg columns: String, whereAllNaN: Boolea
11281153
* ([Column Accessors API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi.ColumnAccessorsApi]). used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in.
11291154
*/
11301155
public fun <T> DataFrame<T>.dropNaNs(vararg columns: AnyColumnReference, whereAllNaN: Boolean = false): DataFrame<T> =
1131-
dropNaNs(whereAllNaN) { columns.toColumns() }
1156+
dropNaNs(whereAllNaN) { columns.toColumnSet() }
11321157

1133-
/**
1134-
* TODO this will be deprecated [PR #286](https://github.com/Kotlin/dataframe/pull/320)
1135-
*/
1158+
@Deprecated(
1159+
message = ITERABLE_COLUMNS_DEPRECATION_MESSAGE,
1160+
replaceWith = ReplaceWith(
1161+
"dropNaNs(whereAllNaN) { columns.toColumnSet() }",
1162+
"org.jetbrains.kotlinx.dataframe.columns.toColumnSet",
1163+
),
1164+
level = DeprecationLevel.ERROR,
1165+
)
11361166
public fun <T> DataFrame<T>.dropNaNs(
11371167
columns: Iterable<AnyColumnReference>,
11381168
whereAllNaN: Boolean = false,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import org.jetbrains.kotlinx.dataframe.DataFrame
1414
import org.jetbrains.kotlinx.dataframe.RowColumnExpression
1515
import org.jetbrains.kotlinx.dataframe.RowValueExpression
1616
import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
17+
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
1718
import org.jetbrains.kotlinx.dataframe.dataTypes.IFRAME
1819
import org.jetbrains.kotlinx.dataframe.dataTypes.IMG
1920
import org.jetbrains.kotlinx.dataframe.exceptions.CellConversionException
@@ -26,14 +27,13 @@ import org.jetbrains.kotlinx.dataframe.impl.api.toLocalDate
2627
import org.jetbrains.kotlinx.dataframe.impl.api.toLocalDateTime
2728
import org.jetbrains.kotlinx.dataframe.impl.api.toLocalTime
2829
import org.jetbrains.kotlinx.dataframe.impl.api.withRowCellImpl
29-
import org.jetbrains.kotlinx.dataframe.impl.columns.toColumns
3030
import org.jetbrains.kotlinx.dataframe.impl.headPlusArray
3131
import org.jetbrains.kotlinx.dataframe.io.toDataFrame
3232
import org.jetbrains.kotlinx.dataframe.path
3333
import java.math.BigDecimal
3434
import java.net.URL
3535
import java.time.LocalTime
36-
import java.util.Locale
36+
import java.util.*
3737
import kotlin.reflect.KProperty
3838
import kotlin.reflect.KType
3939
import kotlin.reflect.typeOf
@@ -42,11 +42,11 @@ public fun <T, C> DataFrame<T>.convert(columns: ColumnsSelector<T, C>): Convert<
4242
Convert(this, columns)
4343

4444
public fun <T, C> DataFrame<T>.convert(vararg columns: KProperty<C>): Convert<T, C> =
45-
convert { columns.toColumns() }
45+
convert { columns.toColumnSet() }
4646

47-
public fun <T> DataFrame<T>.convert(vararg columns: String): Convert<T, Any?> = convert { columns.toColumns() }
47+
public fun <T> DataFrame<T>.convert(vararg columns: String): Convert<T, Any?> = convert { columns.toColumnSet() }
4848
public fun <T, C> DataFrame<T>.convert(vararg columns: ColumnReference<C>): Convert<T, C> =
49-
convert { columns.toColumns() }
49+
convert { columns.toColumnSet() }
5050

5151
public inline fun <T, C, reified R> DataFrame<T>.convert(
5252
firstCol: ColumnReference<C>,

0 commit comments

Comments
 (0)