Skip to content

Commit a575999

Browse files
authored
Fixed formatting (#367)
* Fixed formatting * Fixed the review * Fixed the review
1 parent d13b26a commit a575999

Some content is hidden

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

108 files changed

+1567
-420
lines changed

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnReferenceApi.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,23 @@ import org.jetbrains.kotlinx.dataframe.impl.asList
77
import kotlin.reflect.typeOf
88

99
internal val ColumnReference<*>.name: String get() = name()
10-
public inline fun <reified T> ColumnReference<T>.withValues(vararg values: T): ValueColumn<T> = withValues(values.asIterable())
10+
11+
public inline fun <reified T> ColumnReference<T>.withValues(vararg values: T): ValueColumn<T> =
12+
withValues(values.asIterable())
13+
1114
public inline fun <reified T> ColumnReference<T>.withValues(values: Iterable<T>): ValueColumn<T> =
1215
DataColumn.createValueColumn(name(), values.asList(), typeOf<T>())
1316

1417
public infix fun <C : Comparable<C>> ColumnReference<C>.gt(value: C): ColumnReference<Boolean> = map { it > value }
18+
1519
public infix fun <C : Comparable<C>> ColumnReference<C>.lt(value: C): ColumnReference<Boolean> = map { it < value }
20+
1621
public infix fun <C> ColumnReference<C>.eq(value: C): ColumnReference<Boolean> = map { it == value }
22+
1723
public infix fun <C> ColumnReference<C>.neq(value: C): ColumnReference<Boolean> = map { it != value }
1824

1925
public fun ColumnReference<String?>.length(): ColumnReference<Int> = map { it?.length ?: 0 }
26+
2027
public fun ColumnReference<String?>.lowercase(): ColumnReference<String?> = map { it?.lowercase() }
28+
2129
public fun ColumnReference<String?>.uppercase(): ColumnReference<String?> = map { it?.uppercase() }

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Cumulative.kt

Lines changed: 0 additions & 1 deletion
This file was deleted.

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataColumnArithmetics.kt

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,105 +7,164 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
77
import java.math.BigDecimal
88

99
public operator fun DataColumn<Int>.plus(value: Int): DataColumn<Int> = map { it + value }
10+
1011
public operator fun DataColumn<Int>.minus(value: Int): DataColumn<Int> = map { it - value }
12+
1113
public operator fun Int.plus(column: DataColumn<Int>): DataColumn<Int> = column.map { this + it }
14+
1215
public operator fun Int.minus(column: DataColumn<Int>): DataColumn<Int> = column.map { this - it }
16+
1317
public operator fun DataColumn<Int>.unaryMinus(): DataColumn<Int> = map { -it }
18+
1419
public operator fun DataColumn<Int>.times(value: Int): DataColumn<Int> = map { it * value }
20+
1521
public operator fun DataColumn<Int>.div(value: Int): DataColumn<Int> = map { it / value }
22+
1623
public operator fun Int.div(column: DataColumn<Int>): DataColumn<Int> = column.map { this / it }
24+
1725
public operator fun AnyCol.plus(str: String): DataColumn<String> = map { it.toString() + str }
1826

1927
public operator fun ColumnReference<Int>.plus(value: Int): ColumnReference<Int> = map { it + value }
28+
2029
public operator fun ColumnReference<Int>.minus(value: Int): ColumnReference<Int> = map { it - value }
30+
2131
public operator fun Int.plus(column: ColumnReference<Int>): ColumnReference<Int> = column.map { this + it }
32+
2233
public operator fun Int.minus(column: ColumnReference<Int>): ColumnReference<Int> = column.map { this - it }
34+
2335
public operator fun ColumnReference<Int>.unaryMinus(): ColumnReference<Int> = map { -it }
36+
2437
public operator fun ColumnReference<Int>.times(value: Int): ColumnReference<Int> = map { it * value }
38+
2539
public operator fun ColumnReference<Int>.div(value: Int): ColumnReference<Int> = map { it / value }
40+
2641
public operator fun Int.div(column: ColumnReference<Int>): ColumnReference<Int> = column.map { this / it }
42+
2743
public operator fun ColumnReference<Any?>.plus(str: String): ColumnReference<String> = map { it.toString() + str }
2844

2945
@JvmName("plusIntNullable")
3046
public operator fun DataColumn<Int?>.plus(value: Int): DataColumn<Int?> = map { it?.plus(value) }
47+
3148
@JvmName("minusIntNullable")
3249
public operator fun DataColumn<Int?>.minus(value: Int): DataColumn<Int?> = map { it?.minus(value) }
50+
3351
@JvmName("plusNullable")
3452
public operator fun Int.plus(column: DataColumn<Int?>): DataColumn<Int?> = column.map { it?.plus(this) }
53+
3554
@JvmName("minusNullable")
3655
public operator fun Int.minus(column: DataColumn<Int?>): DataColumn<Int?> = column.map { it?.let { this - it } }
56+
3757
@JvmName("unaryMinusIntNullable")
3858
public operator fun DataColumn<Int?>.unaryMinus(): DataColumn<Int?> = map { it?.unaryMinus() }
59+
3960
@JvmName("timesIntNullable")
4061
public operator fun DataColumn<Int?>.times(value: Int): DataColumn<Int?> = map { it?.times(value) }
62+
4163
@JvmName("divIntNullable")
4264
public operator fun DataColumn<Int?>.div(value: Int): DataColumn<Int?> = map { it?.div(value) }
65+
4366
@JvmName("divNullable")
4467
public operator fun Int.div(column: DataColumn<Int?>): DataColumn<Int?> = column.map { it?.let { this / it } }
4568

4669
@JvmName("plusInt")
4770
public operator fun DataColumn<Int>.plus(value: Double): DataColumn<Double> = map { it + value }
71+
4872
@JvmName("minusInt")
4973
public operator fun DataColumn<Int>.minus(value: Double): DataColumn<Double> = map { it - value }
74+
5075
@JvmName("doublePlus")
5176
public operator fun Double.plus(column: DataColumn<Int>): DataColumn<Double> = column.map { this + it }
77+
5278
@JvmName("doubleMinus")
5379
public operator fun Double.minus(column: DataColumn<Int>): DataColumn<Double> = column.map { this - it }
80+
5481
@JvmName("timesInt")
5582
public operator fun DataColumn<Int>.times(value: Double): DataColumn<Double> = map { it * value }
83+
5684
@JvmName("divInt")
5785
public operator fun DataColumn<Int>.div(value: Double): DataColumn<Double> = map { it / value }
86+
5887
@JvmName("doubleDiv")
5988
public operator fun Double.div(column: DataColumn<Int>): DataColumn<Double> = column.map { this / it }
6089

6190
@JvmName("plusDouble")
6291
public operator fun DataColumn<Double>.plus(value: Int): DataColumn<Double> = map { it + value }
92+
6393
@JvmName("minusDouble")
6494
public operator fun DataColumn<Double>.minus(value: Int): DataColumn<Double> = map { it - value }
95+
6596
@JvmName("intPlus")
6697
public operator fun Int.plus(column: DataColumn<Double>): DataColumn<Double> = column.map { this + it }
98+
6799
@JvmName("intMinus")
68100
public operator fun Int.minus(column: DataColumn<Double>): DataColumn<Double> = column.map { this - it }
101+
69102
@JvmName("timesDouble")
70103
public operator fun DataColumn<Double>.times(value: Int): DataColumn<Double> = map { it * value }
104+
71105
@JvmName("divDouble")
72106
public operator fun DataColumn<Double>.div(value: Int): DataColumn<Double> = map { it / value }
107+
73108
@JvmName("intDiv")
74109
public operator fun Int.div(column: DataColumn<Double>): DataColumn<Double> = column.map { this / it }
75110

76111
public operator fun DataColumn<Double>.plus(value: Double): DataColumn<Double> = map { it + value }
112+
77113
public operator fun DataColumn<Double>.minus(value: Double): DataColumn<Double> = map { it - value }
114+
78115
public operator fun Double.plus(column: DataColumn<Double>): DataColumn<Double> = column.map { this + it }
116+
79117
public operator fun Double.minus(column: DataColumn<Double>): DataColumn<Double> = column.map { this - it }
118+
80119
@JvmName("unaryMinusDouble")
81120
public operator fun DataColumn<Double>.unaryMinus(): DataColumn<Double> = map { -it }
121+
82122
public operator fun DataColumn<Double>.times(value: Double): DataColumn<Double> = map { it * value }
123+
83124
public operator fun DataColumn<Double>.div(value: Double): DataColumn<Double> = map { it / value }
125+
84126
public operator fun Double.div(column: DataColumn<Double>): DataColumn<Double> = column.map { this / it }
85127

86128
public operator fun DataColumn<Long>.plus(value: Long): DataColumn<Long> = map { it + value }
129+
87130
public operator fun DataColumn<Long>.minus(value: Long): DataColumn<Long> = map { it - value }
131+
88132
public operator fun Long.plus(column: DataColumn<Long>): DataColumn<Long> = column.map { this + it }
133+
89134
public operator fun Long.minus(column: DataColumn<Long>): DataColumn<Long> = column.map { this - it }
135+
90136
@JvmName("unaryMinusLong")
91137
public operator fun DataColumn<Long>.unaryMinus(): DataColumn<Long> = map { -it }
138+
92139
public operator fun DataColumn<Long>.times(value: Long): DataColumn<Long> = map { it * value }
140+
93141
public operator fun DataColumn<Long>.div(value: Long): DataColumn<Long> = map { it / value }
142+
94143
public operator fun Long.div(column: DataColumn<Long>): DataColumn<Long> = column.map { this / it }
95144

96145
public operator fun DataColumn<BigDecimal>.plus(value: BigDecimal): DataColumn<BigDecimal> = map { it + value }
146+
97147
public operator fun DataColumn<BigDecimal>.minus(value: BigDecimal): DataColumn<BigDecimal> = map { it - value }
148+
98149
public operator fun BigDecimal.plus(column: DataColumn<BigDecimal>): DataColumn<BigDecimal> = column.map { this + it }
150+
99151
public operator fun BigDecimal.minus(column: DataColumn<BigDecimal>): DataColumn<BigDecimal> = column.map { this - it }
152+
100153
@JvmName("unaryMinusBigDecimal")
101154
public operator fun DataColumn<BigDecimal>.unaryMinus(): DataColumn<BigDecimal> = map { -it }
155+
102156
public operator fun DataColumn<BigDecimal>.times(value: BigDecimal): DataColumn<BigDecimal> = map { it * value }
157+
103158
public operator fun DataColumn<BigDecimal>.div(value: BigDecimal): DataColumn<BigDecimal> = map { it / value }
159+
104160
public operator fun BigDecimal.div(column: DataColumn<BigDecimal>): DataColumn<BigDecimal> = column.map { this / it }
105161

106162
public infix fun <T> DataColumn<T>.eq(value: T): DataColumn<Boolean> = isMatching { it == value }
163+
107164
public infix fun <T> DataColumn<T>.neq(value: T): DataColumn<Boolean> = isMatching { it != value }
165+
108166
public infix fun <T : Comparable<T>> DataColumn<T>.gt(value: T): DataColumn<Boolean> = isMatching { it > value }
167+
109168
public infix fun <T : Comparable<T>> DataColumn<T>.lt(value: T): DataColumn<Boolean> = isMatching { it < value }
110169

111170
internal fun <T> DataColumn<T>.isMatching(predicate: Predicate<T>): DataColumn<Boolean> = map { predicate(it) }

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataColumnType.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,21 @@ import kotlin.reflect.full.isSubtypeOf
1111
import kotlin.reflect.typeOf
1212

1313
public fun AnyCol.isColumnGroup(): Boolean = kind() == ColumnKind.Group
14+
1415
public fun AnyCol.isFrameColumn(): Boolean = kind() == ColumnKind.Frame
16+
1517
public fun AnyCol.isValueColumn(): Boolean = kind() == ColumnKind.Value
1618

1719
public fun AnyCol.isSubtypeOf(type: KType): Boolean = this.type.isSubtypeOf(type) && (!this.type.isMarkedNullable || type.isMarkedNullable)
20+
1821
public inline fun <reified T> AnyCol.isSubtypeOf(): Boolean = isSubtypeOf(typeOf<T>())
22+
1923
public inline fun <reified T> AnyCol.isType(): Boolean = type() == typeOf<T>()
24+
2025
public fun AnyCol.isNumber(): Boolean = isSubtypeOf<Number?>()
26+
2127
public fun AnyCol.isList(): Boolean = typeClass == List::class
28+
2229
public fun AnyCol.isComparable(): Boolean = isSubtypeOf<Comparable<*>?>()
2330

2431
@PublishedApi

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt

Lines changed: 46 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,36 +26,57 @@ import kotlin.reflect.KProperty
2626
public fun <T, C> DataFrame<T>.getColumnsWithPaths(selector: ColumnsSelector<T, C>): List<ColumnWithPath<C>> =
2727
getColumnsWithPaths(UnresolvedColumnsPolicy.Fail, selector)
2828

29-
public fun <T, C> DataFrame<T>.getColumnPath(selector: ColumnSelector<T, C>): ColumnPath = getColumnPaths(selector).single()
29+
public fun <T, C> DataFrame<T>.getColumnPath(selector: ColumnSelector<T, C>): ColumnPath =
30+
getColumnPaths(selector).single()
31+
3032
public fun <T, C> DataFrame<T>.getColumnPaths(selector: ColumnsSelector<T, C>): List<ColumnPath> =
3133
getColumnPaths(UnresolvedColumnsPolicy.Fail, selector)
3234

33-
public fun <T, C> DataFrame<T>.getColumnWithPath(selector: ColumnSelector<T, C>): ColumnWithPath<C> = getColumnsWithPaths(selector).single()
35+
public fun <T, C> DataFrame<T>.getColumnWithPath(selector: ColumnSelector<T, C>): ColumnWithPath<C> =
36+
getColumnsWithPaths(selector).single()
37+
3438
public fun <T, C> DataFrame<T>.getColumns(selector: ColumnsSelector<T, C>): List<DataColumn<C>> = get(selector)
39+
3540
public fun <T> DataFrame<T>.getColumns(vararg columns: String): List<AnyCol> = getColumns { columns.toColumnSet() }
3641

3742
public fun <T> DataFrame<T>.getColumnIndex(col: AnyCol): Int = getColumnIndex(col.name())
38-
public fun <T> DataFrame<T>.getRows(range: IntRange): DataFrame<T> = if (range == indices()) this else columns().map { col -> col[range] }.toDataFrame().cast()
39-
public fun <T> DataFrame<T>.getRows(indices: Iterable<Int>): DataFrame<T> = columns().map { col -> col[indices] }.toDataFrame().cast()
43+
44+
public fun <T> DataFrame<T>.getRows(range: IntRange): DataFrame<T> =
45+
if (range == indices()) this else columns().map { col -> col[range] }.toDataFrame().cast()
46+
47+
public fun <T> DataFrame<T>.getRows(indices: Iterable<Int>): DataFrame<T> =
48+
columns().map { col -> col[indices] }.toDataFrame().cast()
49+
4050
public fun <T> DataFrame<T>.getOrNull(index: Int): DataRow<T>? = if (index < 0 || index >= nrow) null else get(index)
4151

42-
public fun <T> ColumnsContainer<T>.getFrameColumn(columnPath: ColumnPath): FrameColumn<*> = get(columnPath).asAnyFrameColumn()
43-
public fun <T> ColumnsContainer<T>.getFrameColumn(columnName: String): FrameColumn<*> = get(columnName).asAnyFrameColumn()
44-
public fun <T> ColumnsContainer<T>.getColumnGroup(columnPath: ColumnPath): ColumnGroup<*> = get(columnPath).asColumnGroup()
52+
public fun <T> ColumnsContainer<T>.getFrameColumn(columnPath: ColumnPath): FrameColumn<*> =
53+
get(columnPath).asAnyFrameColumn()
54+
55+
public fun <T> ColumnsContainer<T>.getFrameColumn(columnName: String): FrameColumn<*> =
56+
get(columnName).asAnyFrameColumn()
57+
58+
public fun <T> ColumnsContainer<T>.getColumnGroup(columnPath: ColumnPath): ColumnGroup<*> =
59+
get(columnPath).asColumnGroup()
4560

4661
// region getColumn
4762

48-
public fun <T> ColumnsContainer<T>.getColumn(name: String): AnyCol = getColumnOrNull(name) ?: throw IllegalArgumentException("Column not found: '$name'")
63+
public fun <T> ColumnsContainer<T>.getColumn(name: String): AnyCol =
64+
getColumnOrNull(name) ?: throw IllegalArgumentException("Column not found: '$name'")
4965

50-
public fun <T, R> ColumnsContainer<T>.getColumn(column: ColumnReference<DataFrame<R>>): FrameColumn<R> = getColumnOrNull(column)?.asFrameColumn() ?: throw IllegalArgumentException("FrameColumn not found: '$column'")
66+
public fun <T, R> ColumnsContainer<T>.getColumn(column: ColumnReference<DataFrame<R>>): FrameColumn<R> =
67+
getColumnOrNull(column)?.asFrameColumn() ?: throw IllegalArgumentException("FrameColumn not found: '$column'")
5168

52-
public fun <T, R> ColumnsContainer<T>.getColumn(column: ColumnReference<DataRow<R>>): ColumnGroup<R> = getColumnOrNull(column)?.asColumnGroup() ?: throw IllegalArgumentException("ColumnGroup not found: '$column'")
69+
public fun <T, R> ColumnsContainer<T>.getColumn(column: ColumnReference<DataRow<R>>): ColumnGroup<R> =
70+
getColumnOrNull(column)?.asColumnGroup() ?: throw IllegalArgumentException("ColumnGroup not found: '$column'")
5371

54-
public fun <T, R> ColumnsContainer<T>.getColumn(column: ColumnReference<R>): DataColumn<R> = getColumnOrNull(column) ?: throw IllegalArgumentException("Column not found: '$column'")
72+
public fun <T, R> ColumnsContainer<T>.getColumn(column: ColumnReference<R>): DataColumn<R> =
73+
getColumnOrNull(column) ?: throw IllegalArgumentException("Column not found: '$column'")
5574

56-
public fun <T> ColumnsContainer<T>.getColumn(path: ColumnPath): AnyCol = getColumnOrNull(path) ?: throw IllegalArgumentException("Column not found: '$path'")
75+
public fun <T> ColumnsContainer<T>.getColumn(path: ColumnPath): AnyCol =
76+
getColumnOrNull(path) ?: throw IllegalArgumentException("Column not found: '$path'")
5777

58-
public fun <T> ColumnsContainer<T>.getColumn(index: Int): AnyCol = getColumnOrNull(index) ?: throw IllegalArgumentException("Column index is out of bounds: $index. Columns count = $ncol")
78+
public fun <T> ColumnsContainer<T>.getColumn(index: Int): AnyCol = getColumnOrNull(index)
79+
?: throw IllegalArgumentException("Column index is out of bounds: $index. Columns count = $ncol")
5980

6081
public fun <T, C> ColumnsContainer<T>.getColumn(selector: ColumnSelector<T, C>): DataColumn<C> = get(selector)
6182

@@ -67,35 +88,41 @@ public fun <T> ColumnsContainer<T>.getColumnGroup(index: Int): ColumnGroup<*> =
6788

6889
public fun <T> ColumnsContainer<T>.getColumnGroup(name: String): ColumnGroup<*> = getColumn(name).asColumnGroup()
6990

70-
public fun <T> ColumnsContainer<T>.getColumnGroup(column: KProperty<*>): ColumnGroup<*> = getColumnGroup(column.columnName)
91+
public fun <T> ColumnsContainer<T>.getColumnGroup(column: KProperty<*>): ColumnGroup<*> =
92+
getColumnGroup(column.columnName)
7193

72-
public fun <T, C> ColumnsContainer<T>.getColumnGroup(column: ColumnReference<DataRow<C>>): ColumnGroup<C> = getColumn(column)
94+
public fun <T, C> ColumnsContainer<T>.getColumnGroup(column: ColumnReference<DataRow<C>>): ColumnGroup<C> =
95+
getColumn(column)
7396

74-
public fun <T, C> ColumnsContainer<T>.getColumnGroup(column: ColumnSelector<T, DataRow<C>>): ColumnGroup<C> = get(column).asColumnGroup()
97+
public fun <T, C> ColumnsContainer<T>.getColumnGroup(column: ColumnSelector<T, DataRow<C>>): ColumnGroup<C> =
98+
get(column).asColumnGroup()
7599

76100
// endregion
77101

78102
// region getColumnGroupOrNull
79103

80-
public fun <T> ColumnsContainer<T>.getColumnGroupOrNull(name: String): ColumnGroup<*>? = getColumnOrNull(name)?.asColumnGroup()
104+
public fun <T> ColumnsContainer<T>.getColumnGroupOrNull(name: String): ColumnGroup<*>? =
105+
getColumnOrNull(name)?.asColumnGroup()
81106

82-
public fun <T> ColumnsContainer<T>.getColumnGroupOrNull(column: KProperty<*>): ColumnGroup<*>? = getColumnGroupOrNull(column.columnName)
107+
public fun <T> ColumnsContainer<T>.getColumnGroupOrNull(column: KProperty<*>): ColumnGroup<*>? =
108+
getColumnGroupOrNull(column.columnName)
83109

84110
// endregion
85111

86112
// region containsColumn
87113

88114
public fun <C> ColumnsContainer<*>.containsColumn(column: ColumnReference<C>): Boolean = getColumnOrNull(column) != null
115+
89116
public fun ColumnsContainer<*>.containsColumn(column: KProperty<*>): Boolean = containsColumn(column.columnName)
90117

91118
public operator fun ColumnsContainer<*>.contains(column: AnyColumnReference): Boolean = containsColumn(column)
119+
92120
public operator fun ColumnsContainer<*>.contains(column: KProperty<*>): Boolean = containsColumn(column)
93121

94122
// region rows
95123

96124
public fun <T> DataFrame<T>.rows(): Iterable<DataRow<T>> = object : Iterable<DataRow<T>> {
97125
override fun iterator() =
98-
99126
object : Iterator<DataRow<T>> {
100127
var nextRow = 0
101128

@@ -110,7 +137,6 @@ public fun <T> DataFrame<T>.rows(): Iterable<DataRow<T>> = object : Iterable<Dat
110137

111138
public fun <T> DataFrame<T>.rowsReversed(): Iterable<DataRow<T>> = object : Iterable<DataRow<T>> {
112139
override fun iterator() =
113-
114140
object : Iterator<DataRow<T>> {
115141
var nextRow = nrow - 1
116142

0 commit comments

Comments
 (0)