Skip to content

Change default flatten parent-child separator to "_" #920

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 2 commits into from
Oct 16, 2024
Merged

Change default flatten parent-child separator to "_" #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
083c902
change default flatten parent-child separator to "_"
Jolanrensen Oct 14, 2024
fbcb8ff
inlined flatten separator arguments
Jolanrensen Oct 15, 2024
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
10 changes: 5 additions & 5 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,33 @@ import kotlin.reflect.KProperty

@Refine
@Interpretable("FlattenDefault")
public fun <T> DataFrame<T>.flatten(keepParentNameForColumns: Boolean = false, separator: String = "."): DataFrame<T> =
public fun <T> DataFrame<T>.flatten(keepParentNameForColumns: Boolean = false, separator: String = "_"): DataFrame<T> =
flatten(keepParentNameForColumns, separator) { all() }

@Refine
@Interpretable("Flatten0")
public fun <T, C> DataFrame<T>.flatten(
keepParentNameForColumns: Boolean = false,
separator: String = ".",
separator: String = "_",
columns: ColumnsSelector<T, C>,
): DataFrame<T> = flattenImpl(columns, keepParentNameForColumns, separator)

public fun <T> DataFrame<T>.flatten(
vararg columns: String,
keepParentNameForColumns: Boolean = false,
separator: String = ".",
separator: String = "_",
): DataFrame<T> = flatten(keepParentNameForColumns, separator) { columns.toColumnSet() }

public fun <T, C> DataFrame<T>.flatten(
vararg columns: ColumnReference<C>,
keepParentNameForColumns: Boolean = false,
separator: String = ".",
separator: String = "_",
): DataFrame<T> = flatten(keepParentNameForColumns, separator) { columns.toColumnSet() }

public fun <T, C> DataFrame<T>.flatten(
vararg columns: KProperty<C>,
keepParentNameForColumns: Boolean = false,
separator: String = ".",
separator: String = "_",
): DataFrame<T> = flatten(keepParentNameForColumns, separator) { columns.toColumnSet() }

// endregion
2 changes: 1 addition & 1 deletion core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/flatten.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.toColumnSet
internal fun <T, C> DataFrame<T>.flattenImpl(
columns: ColumnsSelector<T, C>,
keepParentNameForColumns: Boolean = false,
separator: String = ".",
separator: String = "_",
): DataFrame<T> {
val rootColumns = getColumnsWithPaths {
columns.toColumnSet().filter { it.isColumnGroup() }.simplify()
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class FlattenTests {

aggregate
.flatten(keepParentNameForColumns = true)
.columnNames() shouldBe listOf("city", "mean.age", "mean.weight", "std.age", "std.weight")
.columnNames() shouldBe listOf("city", "mean_age", "mean_weight", "std_age", "std_weight")

aggregate
.flatten(keepParentNameForColumns = true, separator = "_happy_separator_")
Expand Down
Loading