Skip to content

support applying column operations on row expression result in AddDsl #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2022
Merged

support applying column operations on row expression result in AddDsl #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import org.jetbrains.kotlinx.dataframe.AnyFrame
import org.jetbrains.kotlinx.dataframe.AnyRow
import org.jetbrains.kotlinx.dataframe.Column
import org.jetbrains.kotlinx.dataframe.ColumnsContainer
import org.jetbrains.kotlinx.dataframe.DataColumn
import org.jetbrains.kotlinx.dataframe.DataFrame
import org.jetbrains.kotlinx.dataframe.DataRow
import org.jetbrains.kotlinx.dataframe.RowExpression
Expand Down Expand Up @@ -161,6 +162,10 @@ public class AddDsl<T>(@PublishedApi internal val df: DataFrame<T>) : ColumnsCon
noinline expression: RowExpression<T, R>
): Boolean = add(df.mapToColumn(name, infer, expression))

public inline fun <reified R> expr(noinline expression: RowExpression<T, R>): DataColumn<R> {
return df.mapToColumn("", Infer.Nulls, expression)
}

public inline infix fun <reified R> String.from(noinline expression: RowExpression<T, R>): Boolean = add(this, Infer.Nulls, expression)

// TODO: use path instead of name
Expand Down
4 changes: 3 additions & 1 deletion core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/constructors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import org.jetbrains.kotlinx.dataframe.api.SortDsl
import org.jetbrains.kotlinx.dataframe.api.asDataColumn
import org.jetbrains.kotlinx.dataframe.api.cast
import org.jetbrains.kotlinx.dataframe.api.concat
import org.jetbrains.kotlinx.dataframe.api.dataFrameOf
import org.jetbrains.kotlinx.dataframe.api.indices
import org.jetbrains.kotlinx.dataframe.api.toColumnAccessor
import org.jetbrains.kotlinx.dataframe.api.toColumnOf
Expand Down Expand Up @@ -56,7 +57,8 @@ internal fun <T, R> ColumnsContainer<T>.newColumn(
infer: Infer = Infer.Nulls,
expression: AddExpression<T, R>,
): DataColumn<R> {
val (nullable, values) = computeValues(this as DataFrame<T>, expression)
val df = this as? DataFrame<T> ?: dataFrameOf(columns()).cast()
val (nullable, values) = computeValues(df, expression)
return when (infer) {
Infer.Nulls -> DataColumn.create(name, values, type.withNullability(nullable), Infer.None)
Infer.Type -> DataColumn.createWithTypeInference(name, values, nullable)
Expand Down
8 changes: 8 additions & 0 deletions core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,12 @@ class MapTests {
val frames by columnOf(dataFrameOf("a")(1), emptyDataFrame())
frames.map { it.firstOrNull() }.size() shouldBe frames.size()
}

@Test
fun `map ColumnsContainer`() {
val df = dataFrameOf("a")(1, 2).add {
expr { "a"<Int>() + 1 }.cumSum() into "b"
}
df["b"][1] shouldBe 5
}
}