Skip to content

Commit fbcb8ff

Browse files
committed
inlined flatten separator arguments
1 parent 083c902 commit fbcb8ff

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,37 @@ import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
99
import org.jetbrains.kotlinx.dataframe.impl.api.flattenImpl
1010
import kotlin.reflect.KProperty
1111

12-
public const val FLATTEN_DEFAULT_SEPARATOR: String = "_"
13-
1412
// region DataFrame
1513

1614
@Refine
1715
@Interpretable("FlattenDefault")
18-
public fun <T> DataFrame<T>.flatten(
19-
keepParentNameForColumns: Boolean = false,
20-
separator: String = FLATTEN_DEFAULT_SEPARATOR,
21-
): DataFrame<T> = flatten(keepParentNameForColumns, separator) { all() }
16+
public fun <T> DataFrame<T>.flatten(keepParentNameForColumns: Boolean = false, separator: String = "_"): DataFrame<T> =
17+
flatten(keepParentNameForColumns, separator) { all() }
2218

2319
@Refine
2420
@Interpretable("Flatten0")
2521
public fun <T, C> DataFrame<T>.flatten(
2622
keepParentNameForColumns: Boolean = false,
27-
separator: String = FLATTEN_DEFAULT_SEPARATOR,
23+
separator: String = "_",
2824
columns: ColumnsSelector<T, C>,
2925
): DataFrame<T> = flattenImpl(columns, keepParentNameForColumns, separator)
3026

3127
public fun <T> DataFrame<T>.flatten(
3228
vararg columns: String,
3329
keepParentNameForColumns: Boolean = false,
34-
separator: String = FLATTEN_DEFAULT_SEPARATOR,
30+
separator: String = "_",
3531
): DataFrame<T> = flatten(keepParentNameForColumns, separator) { columns.toColumnSet() }
3632

3733
public fun <T, C> DataFrame<T>.flatten(
3834
vararg columns: ColumnReference<C>,
3935
keepParentNameForColumns: Boolean = false,
40-
separator: String = FLATTEN_DEFAULT_SEPARATOR,
36+
separator: String = "_",
4137
): DataFrame<T> = flatten(keepParentNameForColumns, separator) { columns.toColumnSet() }
4238

4339
public fun <T, C> DataFrame<T>.flatten(
4440
vararg columns: KProperty<C>,
4541
keepParentNameForColumns: Boolean = false,
46-
separator: String = FLATTEN_DEFAULT_SEPARATOR,
42+
separator: String = "_",
4743
): DataFrame<T> = flatten(keepParentNameForColumns, separator) { columns.toColumnSet() }
4844

4945
// endregion

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package org.jetbrains.kotlinx.dataframe.impl.api
22

33
import org.jetbrains.kotlinx.dataframe.ColumnsSelector
44
import org.jetbrains.kotlinx.dataframe.DataFrame
5-
import org.jetbrains.kotlinx.dataframe.api.FLATTEN_DEFAULT_SEPARATOR
65
import org.jetbrains.kotlinx.dataframe.api.asColumnGroup
76
import org.jetbrains.kotlinx.dataframe.api.getColumnsWithPaths
87
import org.jetbrains.kotlinx.dataframe.api.into
@@ -16,7 +15,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.toColumnSet
1615
internal fun <T, C> DataFrame<T>.flattenImpl(
1716
columns: ColumnsSelector<T, C>,
1817
keepParentNameForColumns: Boolean = false,
19-
separator: String = FLATTEN_DEFAULT_SEPARATOR,
18+
separator: String = "_",
2019
): DataFrame<T> {
2120
val rootColumns = getColumnsWithPaths {
2221
columns.toColumnSet().filter { it.isColumnGroup() }.simplify()

0 commit comments

Comments
 (0)