Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Solve the overflow in mean() on integers by promoting accumulator #25

Merged
merged 19 commits into from
Apr 14, 2020
Merged

Solve the overflow in mean() on integers by promoting accumulator #25

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
72e84b1
Solve the overflow in mean() on integers by promoting accumulator to …
Mar 1, 2020
5c652da
Avoid trying to extend Base.promote()
Mar 2, 2020
0143bb3
Update src/Statistics.jl according to maintainer's suggestions
kagalenko-m-b Mar 4, 2020
73756cd
Apply suggestions from code review
kagalenko-m-b Mar 4, 2020
ac17e43
Apply suggestions from code review
kagalenko-m-b Mar 20, 2020
3290a2b
Syntax change to avoid a spurious error
Mar 20, 2020
4d36284
Implement accumulator promotion for generic iterators
Mar 21, 2020
116476f
Summation with promoted accumulator in a single function
Mar 22, 2020
8e62e92
Unify implementation of promotion for AbstractArray
Mar 23, 2020
851a79d
Promote accumulator for generic iterators
Mar 23, 2020
82da02e
Merge branch 'feature_request'
Mar 23, 2020
92a483c
Corrected promotion for iterators
Mar 24, 2020
2d61356
Unified implementations with and without 'dims' keyword
Apr 1, 2020
700bd15
Remove unneeded function
Apr 1, 2020
9fed30f
Suggestions from code review
Apr 2, 2020
a522add
Update src/Statistics.jl
kagalenko-m-b Apr 10, 2020
53962d2
Avoid creation of intermediate array
Apr 12, 2020
792f3f9
Test for return type on empty iterators
kagalenko-m-b Apr 12, 2020
a9030d2
Use + instead of add_sum
nalimilan Apr 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Statistics.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,12 @@ function _mean(f, A::AbstractArray, dims=:)
n = mapreduce(i -> size(A, i), *, unique(dims); init=1)
end
x1 = f(first(A)) / 1
return sum(x -> _mean_promote(x1, f(x)), A, dims=dims) / n
result = sum(x -> _mean_promote(x1, f(x)), A, dims=dims)
if dims === (:)
result /= n
else
result ./= n
end
kagalenko-m-b marked this conversation as resolved.
Show resolved Hide resolved
end
kagalenko-m-b marked this conversation as resolved.
Show resolved Hide resolved

function mean(r::AbstractRange{<:Real})
Expand Down
10 changes: 7 additions & 3 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,13 @@ end
@test mean(x) == sum(x) / length(x)
end
@test mean(Number[1, 1.5, 2+3im]) === 1.5+1im # mixed-type array
kagalenko-m-b marked this conversation as resolved.
Show resolved Hide resolved
@test (@inferred mean(Int[])) === 0.0/0
@test (@inferred mean(Float64[])) === 0.0/0
@test (@inferred mean(Float32[])) === 0.0f0/0
@test mean(v for v in Number[1, 1.5, 2+3im]) === 1.5+1im
@test (@inferred mean(Int[])) === 0/0
@test (@inferred mean(Float32[])) === 0.f0/0
@test (@inferred mean(Float64[])) === 0/0
@test (@inferred mean(filter(x -> true, Int[]))) === 0/0
@test (@inferred mean(filter(x -> true, Float32[]))) === 0.f0/0
@test (@inferred mean(filter(x -> true, Float64[]))) === 0/0
kagalenko-m-b marked this conversation as resolved.
Show resolved Hide resolved
end

@testset "mean/median for ranges" begin
Expand Down