init keyword argument for (map)reduce on general iterator (#592)

JuliaLang · Jul 13, 2018 · e284f84 · e284f84
1 parent e70dc57
commit e284f84
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/Compat.jl b/src/Compat.jl
@@ -1801,6 +1801,12 @@ elseif VERSION < v"0.7.0-beta.81" # julia#27711
         init === nothing ? (dims===nothing ? Base.reduce(op, a) : Base.reduce(op, a, dims=dims)) :
                            (dims===nothing ? Base.reduce(op, init, a) : Base.reduce(op, init, a, dims=dims))
 end
+if VERSION < v"0.7.0-beta.81" # julia#27711
+    mapreduce(f, op, itr; init=nothing) =
+        init === nothing ? Base.mapreduce(f, op, itr) : Base.mapreduce(f, op, init, itr)
+    reduce(op, itr; init=nothing) =
+        init === nothing ? Base.reduce(op, itr) : Base.reduce(op, init, itr)
+end
 if VERSION < v"0.7.0-DEV.4534"
     reverse(a::AbstractArray; dims=nothing) =
         dims===nothing ? Base.reverse(a) : Base.flipdim(a, dims)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1597,12 +1597,14 @@ end
 Issue26488 && @test Compat.mapreduce(string, *, [1 2; 3 4], dims=1) == ["13" "24"]
 Issue26488 && @test Compat.mapreduce(string, *, [1 2; 3 4], dims=2) == hcat(["12", "34"])
 @test Compat.mapreduce(string, *, [1 2; 3 4], init="z") == "z1324"
+@test Compat.mapreduce(string, *, (1, 2, 3, 4), init="z") == "z1234"
 @test Compat.mapreduce(string, *, [1 2; 3 4], dims=1, init="z") == ["z13" "z24"]
 @test Compat.mapreduce(string, *, [1 2; 3 4], dims=2, init="z") == hcat(["z12", "z34"])
 @test Compat.reduce(*, [1 2; 3 4]) == 24
 @test Compat.reduce(*, [1 2; 3 4], dims=1) == [3 8]
 @test Compat.reduce(*, [1 2; 3 4], dims=2) == hcat([2, 12])
 @test Compat.reduce(*, [1 2; 3 4], init=10) == 240
+@test Compat.reduce(*, (1, 2, 3, 4), init=10) == 240
 @test Compat.reduce(*, [1 2; 3 4], dims=1, init=10) == [30 80]
 @test Compat.reduce(*, [1 2; 3 4], dims=2, init=10) == hcat([20, 120])
 @test Compat.sort([1, 2, 3, 4]) == [1, 2, 3, 4]