Aggregator implementation rework #1078
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Jolanrensen
force-pushed
the
aggregators
branch
from
6d24729 to
756473e
Compare
Jolanrensen
changed the title
mean
# Conflicts: # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/aggregation/aggregators/Aggregators.kt
… orNull overloads for each mean function. Added specific overloads for each primitive type -> Double(?) and big number -> BigDecimal(?)
Jolanrensen
force-pushed
the
aggregators
branch
from
f3327d6 to
3ea0167
Compare
…e value instance checks where we know the types already
Jolanrensen
changed the title
mean
Jolanrensen
force-pushed
the
aggregators
branch
3 times, most recently
from
93bd243 to
d91930e
Compare
Jolanrensen
added
bug
…n on primitives only
Jolanrensen
force-pushed
the
aggregators
branch
from
ab976a7 to
851b1a6
Compare
Merged
# Conflicts: # core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt # core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt # core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt
Jolanrensen
force-pushed
the
aggregators
branch
from
bfe2d90 to
868b8a1
Compare
zaleslaw
approved these changes
Mar 11, 2025
dataframe-csv/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/readTsv.kt
Show resolved
Hide resolved
...nerated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DelimParams.kt
Show resolved
Hide resolved
core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/statistics.kt
Outdated
Show resolved
Hide resolved
core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/math/sum.kt
Outdated
Show resolved
Hide resolved
core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/math/std.kt
Outdated
Show resolved
Hide resolved
.../src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/aggregation/aggregators/Aggregators.kt
Show resolved
Hide resolved
.../src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/aggregation/aggregators/Aggregators.kt
Show resolved
Hide resolved
...otlin/org/jetbrains/kotlinx/dataframe/impl/aggregation/aggregators/AggregatorOptionSwitch.kt
Show resolved
Hide resolved
core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/aggregation/aggregators/Aggregator.kt
Show resolved
Hide resolved
| */ | ||
| internal interface UnifyingNumbers { | ||
|
|
||
| /** | ||
| * ``` | ||
| * BigDecimal | ||
| * (BigDecimal) |
There was a problem hiding this comment.
Will it be removed in the next PRs and will you keep the DAG after removal?
There was a problem hiding this comment.
JSON can still create Big numbers and maybe other places where number unification needs to happen can do it. It's only in statistics where we don't want big numbers, right?
There was a problem hiding this comment.
and yes, the DAG is still used to unify numbers before aggregating them with a statistics function. That way the statistics functions don't have to deal with mixed number types.
# Conflicts: # core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/statistics.kt
…. It's unneeded as we can calculate return types at runtime quickly. Added overload for calculateReturnTypeOrNull for multiple columns. Aggregator callers now use this function instead of `preservesType`
# Conflicts: # core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/statistics.kt
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Helps #961
Aggregator improvements
UnifiedNumberTypeOptionssuch that aggregators can choose to not work with big numberspreservesTypesnot always being honoredpreservesTypesremoved since it can usecalculateReturnTypeOrNullcalculateReturnTypeOrNullfunction that needs to be supplied for each aggregator. Often it's as simple as{ _, _ -> typeOf<Double>() }but it can reduce runtime value checks equal to the number of columns. These functions might be reused by the compiler plugin btw ;)aggregateMixedaggregateCalculatingType. Often used in row-functions. It's unnecessary to do runtime reflection since we know the type of each cell in the row after all.Renamed
interComparableColumnstointra-, because that's what it actually does. ("inter" would mean "in between columns", "intra" means "inside a column")