Skip to content

Commit c72335f

Browse files
JolanrensenJolanrensen
committed
renamed interComparable to intraComparable. Language is hard
1 parent 268d238 commit c72335f

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
1414
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
1515
import org.jetbrains.kotlinx.dataframe.columns.values
1616
import org.jetbrains.kotlinx.dataframe.impl.aggregation.aggregators.Aggregators
17-
import org.jetbrains.kotlinx.dataframe.impl.aggregation.interComparableColumns
17+
import org.jetbrains.kotlinx.dataframe.impl.aggregation.intraComparableColumns
1818
import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateAll
1919
import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateFor
2020
import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfDelegated
@@ -55,7 +55,7 @@ public inline fun <reified T : Comparable<T>> AnyRow.rowMaxOf(): T = rowMaxOfOrN
5555

5656
// region DataFrame
5757

58-
public fun <T> DataFrame<T>.max(): DataRow<T> = maxFor(interComparableColumns())
58+
public fun <T> DataFrame<T>.max(): DataRow<T> = maxFor(intraComparableColumns())
5959

6060
public fun <T, C : Comparable<C>> DataFrame<T>.maxFor(columns: ColumnsForAggregateSelector<T, C?>): DataRow<T> =
6161
Aggregators.max.aggregateFor(this, columns)
@@ -134,7 +134,7 @@ public fun <T, C : Comparable<C>> DataFrame<T>.maxByOrNull(column: KProperty<C?>
134134

135135
// region GroupBy
136136

137-
public fun <T> Grouped<T>.max(): DataFrame<T> = maxFor(interComparableColumns())
137+
public fun <T> Grouped<T>.max(): DataFrame<T> = maxFor(intraComparableColumns())
138138

139139
public fun <T, C : Comparable<C>> Grouped<T>.maxFor(columns: ColumnsForAggregateSelector<T, C?>): DataFrame<T> =
140140
Aggregators.max.aggregateFor(this, columns)
@@ -246,7 +246,7 @@ public fun <T, C : Comparable<C>> Pivot<T>.maxBy(column: KProperty<C?>): Reduced
246246

247247
// region PivotGroupBy
248248

249-
public fun <T> PivotGroupBy<T>.max(separate: Boolean = false): DataFrame<T> = maxFor(separate, interComparableColumns())
249+
public fun <T> PivotGroupBy<T>.max(separate: Boolean = false): DataFrame<T> = maxFor(separate, intraComparableColumns())
250250

251251
public fun <T, R : Comparable<R>> PivotGroupBy<T>.maxFor(
252252
separate: Boolean = false,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
1212
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
1313
import org.jetbrains.kotlinx.dataframe.impl.aggregation.aggregators.Aggregators
1414
import org.jetbrains.kotlinx.dataframe.impl.aggregation.aggregators.cast
15-
import org.jetbrains.kotlinx.dataframe.impl.aggregation.interComparableColumns
15+
import org.jetbrains.kotlinx.dataframe.impl.aggregation.intraComparableColumns
1616
import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateAll
1717
import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateFor
1818
import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOf
@@ -55,7 +55,7 @@ public inline fun <reified T : Comparable<T>> AnyRow.rowMedianOf(): T =
5555

5656
// region DataFrame
5757

58-
public fun <T> DataFrame<T>.median(): DataRow<T> = medianFor(interComparableColumns())
58+
public fun <T> DataFrame<T>.median(): DataRow<T> = medianFor(intraComparableColumns())
5959

6060
public fun <T, C : Comparable<C>> DataFrame<T>.medianFor(columns: ColumnsForAggregateSelector<T, C?>): DataRow<T> =
6161
Aggregators.median.aggregateFor(this, columns)
@@ -105,7 +105,7 @@ public inline fun <T, reified R : Comparable<R>> DataFrame<T>.medianOf(
105105

106106
// region GroupBy
107107

108-
public fun <T> Grouped<T>.median(): DataFrame<T> = medianFor(interComparableColumns())
108+
public fun <T> Grouped<T>.median(): DataFrame<T> = medianFor(intraComparableColumns())
109109

110110
public fun <T, C : Comparable<C>> Grouped<T>.medianFor(columns: ColumnsForAggregateSelector<T, C?>): DataFrame<T> =
111111
Aggregators.median.aggregateFor(this, columns)
@@ -147,7 +147,7 @@ public inline fun <T, reified R : Comparable<R>> Grouped<T>.medianOf(
147147

148148
// region Pivot
149149

150-
public fun <T> Pivot<T>.median(separate: Boolean = false): DataRow<T> = medianFor(separate, interComparableColumns())
150+
public fun <T> Pivot<T>.median(separate: Boolean = false): DataRow<T> = medianFor(separate, intraComparableColumns())
151151

152152
public fun <T, C : Comparable<C>> Pivot<T>.medianFor(
153153
separate: Boolean = false,
@@ -191,7 +191,7 @@ public inline fun <T, reified R : Comparable<R>> Pivot<T>.medianOf(
191191
// region PivotGroupBy
192192

193193
public fun <T> PivotGroupBy<T>.median(separate: Boolean = false): DataFrame<T> =
194-
medianFor(separate, interComparableColumns())
194+
medianFor(separate, intraComparableColumns())
195195

196196
public fun <T, C : Comparable<C>> PivotGroupBy<T>.medianFor(
197197
separate: Boolean = false,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
1414
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
1515
import org.jetbrains.kotlinx.dataframe.columns.values
1616
import org.jetbrains.kotlinx.dataframe.impl.aggregation.aggregators.Aggregators
17-
import org.jetbrains.kotlinx.dataframe.impl.aggregation.interComparableColumns
17+
import org.jetbrains.kotlinx.dataframe.impl.aggregation.intraComparableColumns
1818
import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateAll
1919
import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateFor
2020
import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfDelegated
@@ -55,7 +55,7 @@ public inline fun <reified T : Comparable<T>> AnyRow.rowMinOf(): T = rowMinOfOrN
5555

5656
// region DataFrame
5757

58-
public fun <T> DataFrame<T>.min(): DataRow<T> = minFor(interComparableColumns())
58+
public fun <T> DataFrame<T>.min(): DataRow<T> = minFor(intraComparableColumns())
5959

6060
public fun <T, C : Comparable<C>> DataFrame<T>.minFor(columns: ColumnsForAggregateSelector<T, C?>): DataRow<T> =
6161
Aggregators.min.aggregateFor(this, columns)
@@ -134,7 +134,7 @@ public fun <T, C : Comparable<C>> DataFrame<T>.minByOrNull(column: KProperty<C?>
134134

135135
// region GroupBy
136136

137-
public fun <T> Grouped<T>.min(): DataFrame<T> = minFor(interComparableColumns())
137+
public fun <T> Grouped<T>.min(): DataFrame<T> = minFor(intraComparableColumns())
138138

139139
public fun <T, C : Comparable<C>> Grouped<T>.minFor(columns: ColumnsForAggregateSelector<T, C?>): DataFrame<T> =
140140
Aggregators.min.aggregateFor(this, columns)
@@ -247,7 +247,7 @@ public fun <T, C : Comparable<C>> Pivot<T>.minBy(column: KProperty<C?>): Reduced
247247

248248
// region PivotGroupBy
249249

250-
public fun <T> PivotGroupBy<T>.min(separate: Boolean = false): DataFrame<T> = minFor(separate, interComparableColumns())
250+
public fun <T> PivotGroupBy<T>.min(separate: Boolean = false): DataFrame<T> = minFor(separate, intraComparableColumns())
251251

252252
public fun <T, R : Comparable<R>> PivotGroupBy<T>.minFor(
253253
separate: Boolean = false,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
1212
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
1313
import org.jetbrains.kotlinx.dataframe.impl.aggregation.aggregators.Aggregators
1414
import org.jetbrains.kotlinx.dataframe.impl.aggregation.aggregators.cast
15-
import org.jetbrains.kotlinx.dataframe.impl.aggregation.interComparableColumns
15+
import org.jetbrains.kotlinx.dataframe.impl.aggregation.intraComparableColumns
1616
import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateAll
1717
import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateFor
1818
import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOf
@@ -63,7 +63,7 @@ public inline fun <reified T : Comparable<T>> AnyRow.rowPercentileOf(percentile:
6363
// region DataFrame
6464

6565
public fun <T> DataFrame<T>.percentile(percentile: Double): DataRow<T> =
66-
percentileFor(percentile, interComparableColumns())
66+
percentileFor(percentile, intraComparableColumns())
6767

6868
public fun <T, C : Comparable<C>> DataFrame<T>.percentileFor(
6969
percentile: Double,
@@ -128,7 +128,7 @@ public inline fun <T, reified R : Comparable<R>> DataFrame<T>.percentileOf(
128128
// region GroupBy
129129

130130
public fun <T> Grouped<T>.percentile(percentile: Double): DataFrame<T> =
131-
percentileFor(percentile, interComparableColumns())
131+
percentileFor(percentile, intraComparableColumns())
132132

133133
public fun <T, C : Comparable<C>> Grouped<T>.percentileFor(
134134
percentile: Double,
@@ -184,7 +184,7 @@ public inline fun <T, reified R : Comparable<R>> Grouped<T>.percentileOf(
184184
// region Pivot
185185

186186
public fun <T> Pivot<T>.percentile(percentile: Double, separate: Boolean = false): DataRow<T> =
187-
percentileFor(percentile, separate, interComparableColumns())
187+
percentileFor(percentile, separate, intraComparableColumns())
188188

189189
public fun <T, C : Comparable<C>> Pivot<T>.percentileFor(
190190
percentile: Double,
@@ -238,7 +238,7 @@ public inline fun <T, reified R : Comparable<R>> Pivot<T>.percentileOf(
238238
// region PivotGroupBy
239239

240240
public fun <T> PivotGroupBy<T>.percentile(percentile: Double, separate: Boolean = false): DataFrame<T> =
241-
percentileFor(percentile, separate, interComparableColumns())
241+
percentileFor(percentile, separate, intraComparableColumns())
242242

243243
public fun <T, C : Comparable<C>> PivotGroupBy<T>.percentileFor(
244244
percentile: Double,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ internal inline fun <T> Aggregatable<T>.remainingColumns(
1414
crossinline predicate: (AnyCol) -> Boolean,
1515
): ColumnsSelector<T, Any?> = remainingColumnsSelector().filter { predicate(it.data) }
1616

17-
internal fun <T> Aggregatable<T>.interComparableColumns() =
17+
internal fun <T> Aggregatable<T>.intraComparableColumns() =
1818
remainingColumns { it.valuesAreComparable() } as ColumnsSelector<T, Comparable<Any?>>
1919

2020
internal fun <T> Aggregatable<T>.numberColumns() = remainingColumns { it.isNumber() } as ColumnsSelector<T, Number?>

0 commit comments

Comments
 (0)