Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,24 @@ public inline fun <reified T> columnOf(vararg values: T): DataColumn<T> =

public fun columnOf(vararg values: AnyBaseCol): DataColumn<AnyRow> = columnOf(values.asIterable()).forceResolve()

/**
* Example:
* ```kotlin
* val columnGroup = columnOf(
* "a" to columnOf("a1", "a2", "a3"),
* "b" to columnOf(1, 2, 3),
* )
* ```
*/
@Refine
@Interpretable("ColumnOfPairs")
public fun columnOf(vararg columns: Pair<String, AnyBaseCol>): ColumnGroup<*> =
dataFrameOf(
columns.map { (name, col) ->
col.rename(name)
},
).asColumnGroup()

public fun <T> columnOf(vararg frames: DataFrame<T>): FrameColumn<T> = columnOf(frames.asIterable()).forceResolve()

public fun columnOf(columns: Iterable<AnyBaseCol>): DataColumn<AnyRow> =
Expand All @@ -284,15 +302,6 @@ public inline fun <reified T> column(values: Iterable<T>): DataColumn<T> =
allColsMakesColGroup = true,
).forceResolve()

@Refine
@Interpretable("ColumnOfPairs")
public fun columnOf(vararg columns: Pair<String, AnyBaseCol>): ColumnGroup<*> =
dataFrameOf(
columns.map { (name, col) ->
col.rename(name)
},
).asColumnGroup()

// endregion

// region create DataFrame
Expand All @@ -314,6 +323,18 @@ public fun dataFrameOf(columns: Iterable<AnyBaseCol>): DataFrame<*> {
return DataFrameImpl<Unit>(cols, nrow)
}

/**
* Example:
* ```kotlin
* val df = dataFrameOf(
* "a" to columnOf(1, 2),
* "b" to columnOf(1.0, 2.0),
* "group" to columnOf(
* "nestedA" to columnOf("42", "abc"),
* )
* )
* ```
*/
@Refine
@JvmName("dataFrameOfColumns")
@Interpretable("DataFrameOfPairs")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import kotlin.reflect.KType
* Column operations that doesn't clash by signature with [DataFrame] operations can be defined for [BaseColumn]
*
* @param T type of values contained in column.
* @see [org.jetbrains.kotlinx.dataframe.api.columnOf]
* @see [org.jetbrains.kotlinx.dataframe.DataColumn.createByType]
*/
public interface BaseColumn<out T> : ColumnReference<T> {

Expand Down