Skip to content

Commit ddfb7b9

Browse files
authored
Merge pull request #920 from Kotlin/flatten-separator
Change default flatten parent-child separator to "_"
2 parents 117e958 + fbcb8ff commit ddfb7b9

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,33 @@ import kotlin.reflect.KProperty
1313

1414
@Refine
1515
@Interpretable("FlattenDefault")
16-
public fun <T> DataFrame<T>.flatten(keepParentNameForColumns: Boolean = false, separator: String = "."): DataFrame<T> =
16+
public fun <T> DataFrame<T>.flatten(keepParentNameForColumns: Boolean = false, separator: String = "_"): DataFrame<T> =
1717
flatten(keepParentNameForColumns, separator) { all() }
1818

1919
@Refine
2020
@Interpretable("Flatten0")
2121
public fun <T, C> DataFrame<T>.flatten(
2222
keepParentNameForColumns: Boolean = false,
23-
separator: String = ".",
23+
separator: String = "_",
2424
columns: ColumnsSelector<T, C>,
2525
): DataFrame<T> = flattenImpl(columns, keepParentNameForColumns, separator)
2626

2727
public fun <T> DataFrame<T>.flatten(
2828
vararg columns: String,
2929
keepParentNameForColumns: Boolean = false,
30-
separator: String = ".",
30+
separator: String = "_",
3131
): DataFrame<T> = flatten(keepParentNameForColumns, separator) { columns.toColumnSet() }
3232

3333
public fun <T, C> DataFrame<T>.flatten(
3434
vararg columns: ColumnReference<C>,
3535
keepParentNameForColumns: Boolean = false,
36-
separator: String = ".",
36+
separator: String = "_",
3737
): DataFrame<T> = flatten(keepParentNameForColumns, separator) { columns.toColumnSet() }
3838

3939
public fun <T, C> DataFrame<T>.flatten(
4040
vararg columns: KProperty<C>,
4141
keepParentNameForColumns: Boolean = false,
42-
separator: String = ".",
42+
separator: String = "_",
4343
): DataFrame<T> = flatten(keepParentNameForColumns, separator) { columns.toColumnSet() }
4444

4545
// endregion

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/flatten.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.toColumnSet
1515
internal fun <T, C> DataFrame<T>.flattenImpl(
1616
columns: ColumnsSelector<T, C>,
1717
keepParentNameForColumns: Boolean = false,
18-
separator: String = ".",
18+
separator: String = "_",
1919
): DataFrame<T> {
2020
val rootColumns = getColumnsWithPaths {
2121
columns.toColumnSet().filter { it.isColumnGroup() }.simplify()

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class FlattenTests {
9898

9999
aggregate
100100
.flatten(keepParentNameForColumns = true)
101-
.columnNames() shouldBe listOf("city", "mean.age", "mean.weight", "std.age", "std.weight")
101+
.columnNames() shouldBe listOf("city", "mean_age", "mean_weight", "std_age", "std_weight")
102102

103103
aggregate
104104
.flatten(keepParentNameForColumns = true, separator = "_happy_separator_")

0 commit comments

Comments
 (0)