Skip to content

Commit caebba2

Browse files
JolanrensenJolanrensen
committed
ktlint: manual fixes
1 parent 0c66782 commit caebba2

File tree

68 files changed

+477
-204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+477
-204
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ internal interface DiffDocs
9696
*/
9797
internal interface DiffOrNullDocs
9898

99-
@OptIn(ExperimentalTypeInference::class)
100-
@OverloadResolutionByLambdaReturnType
10199
/**
102100
* @include [DiffDocs]
103101
*/
102+
@OptIn(ExperimentalTypeInference::class)
103+
@OverloadResolutionByLambdaReturnType
104104
public fun <T> DataRow<T>.diff(firstRowResult: Double, expression: RowExpression<T, Double>): Double =
105105
prev()?.let { p ->
106106
expression(
@@ -109,12 +109,12 @@ public fun <T> DataRow<T>.diff(firstRowResult: Double, expression: RowExpression
109109
) - expression(p, p)
110110
} ?: firstRowResult
111111

112-
// required to resolve `diff(0) { intValue }`
113-
@OptIn(ExperimentalTypeInference::class)
114-
@OverloadResolutionByLambdaReturnType
115112
/**
116113
* @include [DiffDocs]
117114
*/
115+
@OptIn(ExperimentalTypeInference::class)
116+
@OverloadResolutionByLambdaReturnType
117+
// required to resolve `diff(0) { intValue }`
118118
public fun <T> DataRow<T>.diff(firstRowResult: Int, expression: RowExpression<T, Int>): Int =
119119
prev()?.let { p ->
120120
expression(
@@ -135,11 +135,11 @@ public fun <T> DataRow<T>.diff(firstRowResult: Long, expression: RowExpression<T
135135
public fun <T> DataRow<T>.diff(firstRowResult: Float, expression: RowExpression<T, Float>): Float =
136136
prev()?.let { p -> expression(this, this) - expression(p, p) } ?: firstRowResult
137137

138-
@OptIn(ExperimentalTypeInference::class)
139-
@OverloadResolutionByLambdaReturnType
140138
/**
141139
* @include [DiffOrNullDocs]
142140
*/
141+
@OptIn(ExperimentalTypeInference::class)
142+
@OverloadResolutionByLambdaReturnType
143143
public fun <T> DataRow<T>.diffOrNull(expression: RowExpression<T, Double>): Double? =
144144
prev()?.let { p ->
145145
expression(

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

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,29 @@
11
package org.jetbrains.kotlinx.dataframe.api
22

3-
import org.jetbrains.kotlinx.dataframe.*
3+
import org.jetbrains.kotlinx.dataframe.AnyCol
4+
import org.jetbrains.kotlinx.dataframe.AnyColumnReference
5+
import org.jetbrains.kotlinx.dataframe.AnyFrame
6+
import org.jetbrains.kotlinx.dataframe.AnyRow
7+
import org.jetbrains.kotlinx.dataframe.ColumnsSelector
8+
import org.jetbrains.kotlinx.dataframe.DataColumn
9+
import org.jetbrains.kotlinx.dataframe.DataFrame
410
import org.jetbrains.kotlinx.dataframe.annotations.Interpretable
511
import org.jetbrains.kotlinx.dataframe.annotations.Refine
12+
import org.jetbrains.kotlinx.dataframe.api.DropNA.DropNASelectingOptions
13+
import org.jetbrains.kotlinx.dataframe.api.DropNaNs.DropNaNsSelectingOptions
14+
import org.jetbrains.kotlinx.dataframe.api.DropNulls.DropNullsSelectingOptions
615
import org.jetbrains.kotlinx.dataframe.api.Update.UpdateOperationArg
716
import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
817
import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
918
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
10-
import org.jetbrains.kotlinx.dataframe.documentation.*
19+
import org.jetbrains.kotlinx.dataframe.documentation.DocumentationUrls
20+
import org.jetbrains.kotlinx.dataframe.documentation.ExcludeFromSources
21+
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
22+
import org.jetbrains.kotlinx.dataframe.documentation.NA
23+
import org.jetbrains.kotlinx.dataframe.documentation.NaN
24+
import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns
25+
import org.jetbrains.kotlinx.dataframe.get
26+
import org.jetbrains.kotlinx.dataframe.typeClass
1127
import kotlin.reflect.KProperty
1228

1329
// region fillNulls
@@ -95,7 +111,7 @@ internal inline val Any?.isNA: Boolean
95111

96112
internal inline val AnyCol.canHaveNaN: Boolean get() = typeClass.let { it == Double::class || it == Float::class }
97113

98-
internal inline val AnyCol.canHaveNA: Boolean get() = hasNulls() || canHaveNaN || kind != ColumnKind.Value
114+
internal inline val AnyCol.canHaveNA: Boolean get() = hasNulls() || canHaveNaN || kind() != ColumnKind.Value
99115

100116
internal inline val Double?.isNA: Boolean get() = this == null || this.isNaN()
101117

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.jetbrains.kotlinx.dataframe.impl.api.insertImpl
2424
import org.jetbrains.kotlinx.dataframe.impl.columns.resolveSingle
2525
import kotlin.reflect.KProperty
2626

27-
/**
27+
/*
2828
* `add` operation adds new columns to DataFrame.
2929
*/
3030

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.createColumn
2424
import org.jetbrains.kotlinx.dataframe.impl.columns.createComputedColumnReference
2525
import org.jetbrains.kotlinx.dataframe.impl.columns.forceResolve
2626
import org.jetbrains.kotlinx.dataframe.impl.columns.unbox
27-
import org.jetbrains.kotlinx.dataframe.impl.unnamedColumnPrefix
27+
import org.jetbrains.kotlinx.dataframe.impl.UNNAMED_COLUMN_PREFIX
2828
import org.jetbrains.kotlinx.dataframe.size
2929
import kotlin.random.Random
3030
import kotlin.random.nextInt
@@ -410,7 +410,7 @@ public class DynamicDataFrameBuilder {
410410

411411
public fun add(col: AnyCol): String {
412412
val uniqueName = if (col.name().isEmpty()) {
413-
generator.addUnique(unnamedColumnPrefix)
413+
generator.addUnique(UNNAMED_COLUMN_PREFIX)
414414
} else {
415415
generator.addUnique(col.name())
416416
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ import org.jetbrains.kotlinx.dataframe.DataColumn
1313
import org.jetbrains.kotlinx.dataframe.DataFrame
1414
import org.jetbrains.kotlinx.dataframe.RowColumnExpression
1515
import org.jetbrains.kotlinx.dataframe.RowValueExpression
16-
import org.jetbrains.kotlinx.dataframe.annotations.*
16+
import org.jetbrains.kotlinx.dataframe.annotations.HasSchema
17+
import org.jetbrains.kotlinx.dataframe.annotations.Interpretable
18+
import org.jetbrains.kotlinx.dataframe.annotations.Refine
1719
import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
1820
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
1921
import org.jetbrains.kotlinx.dataframe.dataTypes.IFRAME
@@ -34,7 +36,7 @@ import org.jetbrains.kotlinx.dataframe.path
3436
import java.math.BigDecimal
3537
import java.net.URL
3638
import java.time.LocalTime
37-
import java.util.*
39+
import java.util.Locale
3840
import kotlin.reflect.KProperty
3941
import kotlin.reflect.KType
4042
import kotlin.reflect.full.isSubtypeOf

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ public fun <T, C> MoveClause<T, C>.after(column: KProperty<*>): DataFrame<T> = a
138138

139139
// endregion
140140

141-
// TODO: implement 'before'
142-
/*
141+
/* TODO: implement 'before'
143142
fun <T, C> MoveColsClause<T, C>.before(columnPath: ColumnPath) = before { columnPath.toColumnDef() }
144143
fun <T, C> MoveColsClause<T, C>.before(column: Column) = before { column }
145144
fun <T, C> MoveColsClause<T, C>.before(column: KProperty<*>) = before { column.toColumnDef() }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import org.jetbrains.kotlinx.dataframe.impl.api.parseImpl
1111
import org.jetbrains.kotlinx.dataframe.impl.api.tryParseImpl
1212
import org.jetbrains.kotlinx.dataframe.typeClass
1313
import java.time.format.DateTimeFormatter
14-
import java.util.*
14+
import java.util.Locale
1515
import kotlin.reflect.KProperty
1616

1717
public val DataFrame.Companion.parser: GlobalParserOptions get() = Parsers

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package org.jetbrains.kotlinx.dataframe.api
22

3-
import org.jetbrains.kotlinx.dataframe.*
3+
import org.jetbrains.kotlinx.dataframe.AnyRow
4+
import org.jetbrains.kotlinx.dataframe.DataColumn
5+
import org.jetbrains.kotlinx.dataframe.DataFrame
6+
import org.jetbrains.kotlinx.dataframe.DataRow
47
import org.jetbrains.kotlinx.dataframe.impl.api.convertTo
58
import org.jetbrains.kotlinx.dataframe.impl.columnName
69
import org.jetbrains.kotlinx.dataframe.impl.owner

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,11 @@ public fun <T, C> Update<T, C>.perRowCol(expression: RowColumnExpression<T, C, C
253253
@ExcludeFromSources
254254
private interface SeeAlsoPerRowCol
255255

256-
/** ## Update Expression
256+
/**
257+
* ## Update Expression
257258
* @see ExpressionsGivenRow.RowValueExpression.WithExample
258259
* @see ExpressionsGivenRow.AddDataRowNote
259260
*/
260-
// doc processor plugin does not work with type aliases yet
261261
public typealias UpdateExpression<T, C, R> = AddDataRow<T>.(C) -> R
262262

263263
/** ## With

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/CodeWithConverter.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import org.jetbrains.kotlinx.jupyter.api.VariableName
99
* @param declarations The generated code.
1010
* @param converter Optional converter for the [Marker], such as a [org.jetbrains.kotlinx.dataframe.api.cast], often used for Jupyter.
1111
*/
12-
public data class CodeWithConverter(val declarations: Code, val converter: (VariableName) -> Code = EmptyConverter) {
12+
public data class CodeWithConverter(val declarations: Code, val converter: (VariableName) -> Code = EMPTY_CONVERTER) {
1313

1414
public companion object {
15-
public const val EmptyDeclarations: Code = ""
16-
public val EmptyConverter: (VariableName) -> Code = { it }
17-
public val Empty: CodeWithConverter = CodeWithConverter(EmptyDeclarations, EmptyConverter)
15+
public const val EMPTY_DECLARATIONS: Code = ""
16+
public val EMPTY_CONVERTER: (VariableName) -> Code = { it }
17+
public val EMPTY: CodeWithConverter = CodeWithConverter(EMPTY_DECLARATIONS, EMPTY_CONVERTER)
1818
}
1919

2020
val hasDeclarations: Boolean get() = declarations.isNotBlank()

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/DefaultReadDfMethods.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ public interface DefaultReadDfMethod {
1919
}
2020

2121
// Used APIs
22-
private const val cast = "cast"
23-
private const val verify = "verify" // cast(true) is obscure, i think it's better to use named argument here
24-
private const val readCSV = "readCSV"
25-
private const val readTSV = "readTSV"
26-
private const val readJson = "readJson"
27-
private const val readJdbc = "readJdbc"
22+
private const val CAST = "cast"
23+
private const val VERIFY = "verify" // cast(true) is obscure, i think it's better to use named argument here
24+
private const val READ_CSV = "readCSV"
25+
private const val READ_TSV = "readTSV"
26+
private const val READ_JSON = "readJson"
27+
private const val READ_JDBC = "readJdbc"
2828

2929
public abstract class AbstractDefaultReadMethod(
3030
private val path: String?,
@@ -78,7 +78,7 @@ public abstract class AbstractDefaultReadMethod(
7878
).addCode(
7979
"""
8080
val df = DataFrame.$methodName(path, $arguments)
81-
return if ($verify != null) df.$cast($verify = $verify) else df.$cast()
81+
return if ($VERIFY != null) df.$CAST($VERIFY = $VERIFY) else df.$CAST()
8282
""".trimIndent(),
8383
).build(),
8484
).build()
@@ -93,10 +93,10 @@ internal class DefaultReadJsonMethod(path: String?, arguments: MethodArguments)
9393
AbstractDefaultReadMethod(
9494
path = path,
9595
arguments = arguments,
96-
methodName = readJson,
96+
methodName = READ_JSON,
9797
)
9898

9999
internal class DefaultReadCsvMethod(path: String?, arguments: MethodArguments) :
100-
AbstractDefaultReadMethod(path, arguments, readCSV)
100+
AbstractDefaultReadMethod(path, arguments, READ_CSV)
101101

102-
internal class DefaultReadTsvMethod(path: String?) : AbstractDefaultReadMethod(path, MethodArguments.EMPTY, readTSV)
102+
internal class DefaultReadTsvMethod(path: String?) : AbstractDefaultReadMethod(path, MethodArguments.EMPTY, READ_TSV)

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/ColumnsResolver.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ package org.jetbrains.kotlinx.dataframe.columns
33
import org.jetbrains.kotlinx.dataframe.ColumnsSelector
44
import org.jetbrains.kotlinx.dataframe.DataColumn
55
import org.jetbrains.kotlinx.dataframe.DataFrame
6-
import org.jetbrains.kotlinx.dataframe.impl.columns.*
6+
import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet
7+
import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableSingleColumn
8+
import org.jetbrains.kotlinx.dataframe.impl.columns.transform
79

810
/**
911
* ## ColumnsResolver

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/AccessApi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jetbrains.kotlinx.dataframe.documentation
22

3-
import org.jetbrains.kotlinx.dataframe.documentation.AccessApi.*
3+
import org.jetbrains.kotlinx.dataframe.documentation.AccessApi.AnyApiLinks
44

55
/**
66
* ## Access APIs

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenColumn.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package org.jetbrains.kotlinx.dataframe.documentation
22

3-
import org.jetbrains.kotlinx.dataframe.*
4-
import org.jetbrains.kotlinx.dataframe.api.*
3+
import org.jetbrains.kotlinx.dataframe.DataColumn
4+
import org.jetbrains.kotlinx.dataframe.api.count
5+
import org.jetbrains.kotlinx.dataframe.api.mean
56
import org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenColumn.ColumnExpressionLink
67
import org.jetbrains.kotlinx.dataframe.ColumnExpression as DfColumnExpression
78

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenDataFrame.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jetbrains.kotlinx.dataframe.documentation
22

33
import org.jetbrains.kotlinx.dataframe.DataFrame
4-
import org.jetbrains.kotlinx.dataframe.api.*
4+
import org.jetbrains.kotlinx.dataframe.api.select
55
import org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenDataFrame.DataFrameExpressionLink
66
import org.jetbrains.kotlinx.dataframe.DataFrameExpression as DfDataFrameExpression
77

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRow.kt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,17 @@ package org.jetbrains.kotlinx.dataframe.documentation
22

33
import org.jetbrains.kotlinx.dataframe.DataFrame
44
import org.jetbrains.kotlinx.dataframe.DataRow
5-
import org.jetbrains.kotlinx.dataframe.api.*
6-
import org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenRow.*
5+
import org.jetbrains.kotlinx.dataframe.api.AddDataRow
6+
import org.jetbrains.kotlinx.dataframe.api.Convert
7+
import org.jetbrains.kotlinx.dataframe.api.Update
8+
import org.jetbrains.kotlinx.dataframe.api.add
9+
import org.jetbrains.kotlinx.dataframe.api.insert
10+
import org.jetbrains.kotlinx.dataframe.api.map
11+
import org.jetbrains.kotlinx.dataframe.api.notNull
12+
import org.jetbrains.kotlinx.dataframe.api.with
13+
import org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenRow.AddDataRowNote
14+
import org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenRow.RowExpressionLink
15+
import org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenRow.RowValueExpressionLink
716
import org.jetbrains.kotlinx.dataframe.RowExpression as DfRowExpression
817
import org.jetbrains.kotlinx.dataframe.RowValueExpression as DfRowValueExpression
918

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRowAndColumn.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jetbrains.kotlinx.dataframe.documentation
22

3-
import org.jetbrains.kotlinx.dataframe.*
4-
import org.jetbrains.kotlinx.dataframe.api.*
3+
import org.jetbrains.kotlinx.dataframe.DataColumn
4+
import org.jetbrains.kotlinx.dataframe.api.mean
55
import org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenRowAndColumn.RowColumnExpressionLink
66
import org.jetbrains.kotlinx.dataframe.RowColumnExpression as DfRowColumnExpression
77

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/SelectingRows.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@ package org.jetbrains.kotlinx.dataframe.documentation
22

33
import org.jetbrains.kotlinx.dataframe.RowFilter
44
import org.jetbrains.kotlinx.dataframe.RowValueFilter
5-
import org.jetbrains.kotlinx.dataframe.api.*
5+
import org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl
6+
import org.jetbrains.kotlinx.dataframe.api.count
7+
import org.jetbrains.kotlinx.dataframe.api.diff
8+
import org.jetbrains.kotlinx.dataframe.api.drop
9+
import org.jetbrains.kotlinx.dataframe.api.filter
10+
import org.jetbrains.kotlinx.dataframe.api.first
11+
import org.jetbrains.kotlinx.dataframe.api.format
12+
import org.jetbrains.kotlinx.dataframe.api.gather
13+
import org.jetbrains.kotlinx.dataframe.api.update
614
import org.jetbrains.kotlinx.dataframe.documentation.SelectingRows.RowConditionLink
715
import org.jetbrains.kotlinx.dataframe.documentation.SelectingRows.RowValueConditionLink
816
import org.jetbrains.kotlinx.dataframe.index

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/exceptions/TypeConversionException.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.jetbrains.kotlinx.dataframe.exceptions
22

33
import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
4-
import kotlin.reflect.*
54
import kotlin.reflect.KType
65

76
public open class TypeConversionException(

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/exceptions/TypeConverterNotFoundException.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.jetbrains.kotlinx.dataframe.exceptions
22

33
import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
4-
import kotlin.reflect.*
54
import kotlin.reflect.KType
65

76
public class TypeConverterNotFoundException(

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/DataFrameImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.resolveSingle
2727
import org.jetbrains.kotlinx.dataframe.io.renderToString
2828
import kotlin.reflect.KProperty
2929

30-
internal const val unnamedColumnPrefix = "untitled"
30+
internal const val UNNAMED_COLUMN_PREFIX = "untitled"
3131

3232
internal open class DataFrameImpl<T>(cols: List<AnyCol>, val nrow: Int) :
3333
DataFrame<T>,
@@ -65,7 +65,7 @@ internal open class DataFrameImpl<T>(cols: List<AnyCol>, val nrow: Int) :
6565
columns = cols.mapIndexed { i, col ->
6666
val name = col.name
6767
if (name.isEmpty()) {
68-
val uniqueName = nameGenerator.addUnique(unnamedColumnPrefix)
68+
val uniqueName = nameGenerator.addUnique(UNNAMED_COLUMN_PREFIX)
6969
val renamed = col.rename(uniqueName)
7070
columnsMap[uniqueName] = i
7171
renamed

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/MathUtils.kt

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

33
import org.jetbrains.kotlinx.dataframe.DataColumn
4-
import org.jetbrains.kotlinx.dataframe.io.defaultPrecision
4+
import org.jetbrains.kotlinx.dataframe.io.DEFAULT_PRECISION
55
import org.jetbrains.kotlinx.dataframe.typeClass
66
import java.math.BigDecimal
77

@@ -13,7 +13,7 @@ internal fun <T : Number> DataColumn<T?>.scale(): Int {
1313
BigDecimal::class -> values().maxOf { (it as? BigDecimal)?.scale() ?: 1 }
1414
Number::class -> values().maxOf { (it as? Number)?.scale() ?: 0 }
1515
else -> 0
16-
}.coerceAtMost(defaultPrecision)
16+
}.coerceAtMost(DEFAULT_PRECISION)
1717
}
1818

1919
internal fun Double.scale() = if (isFinite()) toBigDecimal().scale() else 0

0 commit comments

Comments
 (0)