From 84c459ff92c73f38157795ec85b531073b3a0f69 Mon Sep 17 00:00:00 2001 From: Martin Holters Date: Tue, 8 Oct 2019 18:22:50 +0200 Subject: [PATCH] Drop compat code for `dims` and `init` kwargs from #518, #528, #590, #592, and #613 --- README.md | 10 --- src/Compat.jl | 73 ---------------------- test/old.jl | 156 +++++++++++++++++++++++++++++++++++++++++++++++ test/runtests.jl | 155 ---------------------------------------------- 4 files changed, 156 insertions(+), 238 deletions(-) diff --git a/README.md b/README.md index 7d507910f..8bf9aff78 100644 --- a/README.md +++ b/README.md @@ -72,18 +72,8 @@ Currently, the `@compat` macro supports the following syntaxes: * `range` supporting `stop` as positional argument ([#28708]). -* `Compat.accumulate`, `Compat.accumulate!`, `Compat.all`, `Compat.any`, - `Compat.cumprod`, `Compat.cumprod!`, `Compat.cumsum`, `Compat.cumsum!`, - `Compat.findmax`, `Compat.findmin`, `Compat.mapreduce`, `Compat.maximum`, - `Compat.minimum`, `Compat.prod`, `Compat.reduce`, `Compat.sort`, - and `Compat.sum` with `dims` keyword argument ([#25989],[#26369]). - -* `Compat.mapreduce` and `Compat.reduce` with `init` keyword argument ([#27711]). - * `selectdim` to obtain a view of an array with a specified index for a specified dimension ([#26009]). -* `Compat.cat` with `dims` as keyword argument ([#27163]) - * Single-argument `permutedims(x)` for matrices and vectors ([#24839]). * `fetch` for `Task`s ([#25940]). diff --git a/src/Compat.jl b/src/Compat.jl index 006e9ab19..1342de441 100644 --- a/src/Compat.jl +++ b/src/Compat.jl @@ -76,79 +76,6 @@ end end end -if VERSION < v"0.7.0-DEV.4064" - for f in (:mean, :median, :var, :varm, :std, :cov, :cor) - @eval import .Statistics: $f # compatibility with old Compat versions - end - for f in (:cumsum, :cumprod, :sum, :prod, :maximum, :minimum, :all, :any) - @eval begin - $f(a::AbstractArray; dims=nothing) = - dims===nothing ? Base.$f(a) : Base.$f(a, dims) - end - end - for f in (:sum, :prod, :maximum, :minimum, :all, :any, :accumulate) - @eval begin - $f(f, a::AbstractArray; dims=nothing) = - dims===nothing ? Base.$f(f, a) : Base.$f(f, a, dims) - end - end - for f in (:findmax, :findmin) - @eval begin - $f(a::AbstractVector; dims=nothing) = - dims===nothing ? Base.$f(a) : Base.$f(a, dims) - function $f(a::AbstractArray; dims=nothing) - vs, inds = dims===nothing ? Base.$f(a) : Base.$f(a, dims) - cis = CartesianIndices(a) - return (vs, map(i -> cis[i], inds)) - end - end - end - @eval sort(a::AbstractArray; dims=nothing, kwargs...) = - dims===nothing ? Base.sort(a; kwargs...) : Base.sort(a, dims; kwargs...) - for f in (:cumsum!, :cumprod!) - @eval $f(out, a; dims=nothing) = - dims===nothing ? Base.$f(out, a) : Base.$f(out, a, dims) - end -end -if VERSION < v"0.7.0-DEV.4064" - mapreduce(f, op, a::AbstractArray; dims=nothing, init=nothing) = - init === nothing ? (dims===nothing ? Base.mapreduce(f, op, a) : Base.mapreducedim(f, op, a, dims)) : - (dims===nothing ? Base.mapreduce(f, op, init, a) : Base.mapreducedim(f, op, a, dims, init)) - reduce(op, a::AbstractArray; dims=nothing, init=nothing) = - init === nothing ? (dims===nothing ? Base.reduce(op, a) : Base.reducedim(op, a, dims)) : - (dims===nothing ? Base.reduce(op, init, a) : Base.reducedim(op, a, dims, init)) - accumulate!(op, out, a; dims=nothing) = - dims===nothing ? Base.accumulate!(op, out, a) : Base.accumulate!(op, out, a, dims) - # kept for compatibility with early adopters - mapreduce(f, op, v0, a::AbstractArray; dims=nothing) = - mapreduce(f, op, a, dims=dims, init=v0) - reduce(op, v0, a::AbstractArray; dims=nothing) = - reduce(op, a, dims=dims, init=v0) -elseif VERSION < v"0.7.0-beta.81" # julia#27711 - mapreduce(f, op, a::AbstractArray; dims=nothing, init=nothing) = - init === nothing ? (dims===nothing ? Base.mapreduce(f, op, a) : Base.mapreduce(f, op, a, dims=dims)) : - (dims===nothing ? Base.mapreduce(f, op, init, a) : Base.mapreduce(f, op, init, a, dims=dims)) - reduce(op, a::AbstractArray; dims=nothing, init=nothing) = - 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) -end -if VERSION < v"0.7.0-DEV.4738" - Base.squeeze(A; dims=error("squeeze: keyword argument dims not assigned")) = squeeze(A, dims) -end -if VERSION < v"0.7.0-DEV.5165" # julia#27163 - cat(X...; dims = throw(UndefKeywordError("cat: keyword argument dims not assigned"))) = Base.cat(dims, X...) -end - if !isdefined(Base, :selectdim) # 0.7.0-DEV.3976 export selectdim @inline selectdim(A::AbstractArray, d::Integer, i) = _selectdim(A, d, i, Base.setindex(map(Base.Slice, axes(A)), i, d)) diff --git a/test/old.jl b/test/old.jl index 1d4be6f15..8c4d1ec1b 100644 --- a/test/old.jl +++ b/test/old.jl @@ -870,3 +870,159 @@ end @test !islowercase('A') @test uppercasefirst("qwerty") == "Qwerty" @test lowercasefirst("Qwerty") == "qwerty" + +# 0.7.0-DEV.4064 +# some tests are behind a version check below because Julia gave +# the wrong result between 0.7.0-DEV.3262 and 0.7.0-DEV.4646 +# see https://github.com/JuliaLang/julia/issues/26488 +Issue26488 = VERSION < v"0.7.0-DEV.3262" || VERSION >= v"0.7.0-DEV.4646" +@test Compat.Statistics.mean([1 2; 3 4]) == 2.5 +@test Compat.Statistics.mean([1 2; 3 4], dims=1) == [2 3] +@test Compat.Statistics.mean([1 2; 3 4], dims=2) == hcat([1.5; 3.5]) +@test Compat.cumsum([1 2; 3 4], dims=1) == [1 2; 4 6] +@test Compat.cumsum([1 2; 3 4], dims=2) == [1 3; 3 7] +@test Compat.cumprod([1 2; 3 4], dims=1) == [1 2; 3 8] +@test Compat.cumprod([1 2; 3 4], dims=2) == [1 2; 3 12] +@test Compat.sum([1 2; 3 4]) == 10 +@test Compat.sum([1 2; 3 4], dims=1) == [4 6] +@test Compat.sum([1 2; 3 4], dims=2) == hcat([3; 7]) +@test Compat.sum(x -> x+1, [1 2; 3 4]) == 14 +Issue26488 && @test Compat.sum(x -> x+1, [1 2; 3 4], dims=1) == [6 8] +Issue26488 && @test Compat.sum(x -> x+1, [1 2; 3 4], dims=2) == hcat([5; 9]) +@test Compat.prod([1 2; 3 4]) == 24 +@test Compat.prod([1 2; 3 4], dims=1) == [3 8] +@test Compat.prod([1 2; 3 4], dims=2) == hcat([2; 12]) +@test Compat.prod(x -> x+1, [1 2; 3 4]) == 120 +Issue26488 && @test Compat.prod(x -> x+1, [1 2; 3 4], dims=1) == [8 15] +Issue26488 && @test Compat.prod(x -> x+1, [1 2; 3 4], dims=2) == hcat([6; 20]) +@test Compat.maximum([1 2; 3 4]) == 4 +@test Compat.maximum([1 2; 3 4], dims=1) == [3 4] +@test Compat.maximum([1 2; 3 4], dims=2) == hcat([2; 4]) +@test Compat.maximum(x -> x+1, [1 2; 3 4]) == 5 +@test Compat.maximum(x -> x+1, [1 2; 3 4], dims=1) == [4 5] +@test Compat.maximum(x -> x+1, [1 2; 3 4], dims=2) == hcat([3; 5]) +@test Compat.minimum([1 2; 3 4]) == 1 +@test Compat.minimum([1 2; 3 4], dims=1) == [1 2] +@test Compat.minimum([1 2; 3 4], dims=2) == hcat([1; 3]) +@test Compat.minimum(x -> x+1, [1 2; 3 4]) == 2 +@test Compat.minimum(x -> x+1, [1 2; 3 4], dims=1) == [2 3] +@test Compat.minimum(x -> x+1, [1 2; 3 4], dims=2) == hcat([2; 4]) +@test Compat.all([true false; true false]) == false +@test Compat.all([true false; true false], dims=1) == [true false] +@test Compat.all([true false; true false], dims=2) == hcat([false; false]) +@test Compat.all(isodd, [1 2; 3 4]) == false +@test Compat.all(isodd, [1 2; 3 4], dims=1) == [true false] +@test Compat.all(isodd, [1 2; 3 4], dims=2) == hcat([false; false]) +@test Compat.any([true false; true false]) == true +@test Compat.any([true false; true false], dims=1) == [true false] +@test Compat.any([true false; true false], dims=2) == hcat([true; true]) +@test Compat.any(isodd, [1 2; 3 4]) == true +@test Compat.any(isodd, [1 2; 3 4], dims=1) == [true false] +@test Compat.any(isodd, [1 2; 3 4], dims=2) == hcat([true; true]) +@test Compat.findmax([3, 2, 7, 4]) == (7, 3) +@test Compat.findmax([3, 2, 7, 4], dims=1) == ([7], [3]) +@test Compat.findmax([1 2; 3 4], dims=1) == ([3 4], [CartesianIndex(2, 1) CartesianIndex(2, 2)]) +@test Compat.findmax([1 2; 3 4]) == (4, CartesianIndex(2, 2)) +@test Compat.findmax([1 2; 3 4], dims=1) == ([3 4], [CartesianIndex(2, 1) CartesianIndex(2, 2)]) +@test Compat.findmax([1 2; 3 4], dims=2) == (hcat([2; 4]), hcat([CartesianIndex(1, 2); CartesianIndex(2, 2)])) +@test Compat.findmin([3, 2, 7, 4]) == (2, 2) +@test Compat.findmin([3, 2, 7, 4], dims=1) == ([2], [2]) +@test Compat.findmin([1 2; 3 4]) == (1, CartesianIndex(1, 1)) +@test Compat.findmin([1 2; 3 4], dims=1) == ([1 2], [CartesianIndex(1, 1) CartesianIndex(1, 2)]) +@test Compat.findmin([1 2; 3 4], dims=2) == (hcat([1; 3]), hcat([CartesianIndex(1, 1); CartesianIndex(2, 1)])) +if VERSION < v"0.7.0-DEV.5238" + # Test these functions if their counterparts are defined in Base. In the future, this + # will be dealt with in StatsBase + @test Compat.Statistics.varm([1 2; 3 4], -1) == 18 + @test Compat.Statistics.varm([1 2; 3 4], [-1 -2], dims=1) == [20 52] + @test Compat.Statistics.varm([1 2; 3 4], [-1, -2], dims=2) == hcat([13, 61]) + @test Compat.Statistics.var([1 2; 3 4]) == 5/3 + @test Compat.Statistics.var([1 2; 3 4], dims=1) == [2 2] + @test Compat.Statistics.var([1 2; 3 4], dims=2) == hcat([0.5, 0.5]) + @test Compat.Statistics.var([1 2; 3 4], corrected=false) == 1.25 + @test Compat.Statistics.var([1 2; 3 4], corrected=false, dims=1) == [1 1] + @test Compat.Statistics.var([1 2; 3 4], corrected=false, dims=2) == hcat([0.25, 0.25]) + @test Compat.Statistics.std([1 2; 3 4]) == sqrt(5/3) + @test Compat.Statistics.std([1 2; 3 4], dims=1) == [sqrt(2) sqrt(2)] + @test Compat.Statistics.std([1 2; 3 4], dims=2) == hcat([sqrt(0.5), sqrt(0.5)]) + @test Compat.Statistics.std([1 2; 3 4], corrected=false) == sqrt(1.25) + @test Compat.Statistics.std([1 2; 3 4], corrected=false, dims=1) == [sqrt(1) sqrt(1)] + @test Compat.Statistics.std([1 2; 3 4], corrected=false, dims=2) == hcat([sqrt(0.25), sqrt(0.25)]) + @test Compat.Statistics.cov([1 2; 3 4]) == [2 2; 2 2] + @test Compat.Statistics.cov([1 2; 3 4], dims=1) == [2 2; 2 2] + @test Compat.Statistics.cov([1 2; 3 4], dims=2) == [0.5 0.5; 0.5 0.5] + @test Compat.Statistics.cov([1 2; 3 4], [4; 5]) == hcat([1; 1]) + @test Compat.Statistics.cov([1 2; 3 4], [4; 5], dims=1) == hcat([1; 1]) + @test Compat.Statistics.cov([1 2; 3 4], [4; 5], dims=2) == hcat([0.5; 0.5]) + @test Compat.Statistics.cov([1 2; 3 4], [4; 5], corrected=false) == hcat([0.5; 0.5]) + @test Compat.Statistics.cov([1 2; 3 4], [4; 5], corrected=false, dims=1) == hcat([0.5; 0.5]) + @test Compat.Statistics.cov([1 2; 3 4], [4; 5], corrected=false, dims=2) == hcat([0.25; 0.25]) + @test Compat.Statistics.cor([1 2; 3 4]) ≈ [1 1; 1 1] + @test Compat.Statistics.cor([1 2; 3 4], dims=1) ≈ [1 1; 1 1] + @test Compat.Statistics.cor([1 2; 3 4], dims=2) ≈ [1 1; 1 1] + @test Compat.Statistics.cor([1 2; 3 4], [4; 5]) ≈ [1; 1] + @test Compat.Statistics.cor([1 2; 3 4], [4; 5], dims=1) ≈ [1; 1] + @test Compat.Statistics.cor([1 2; 3 4], [4; 5], dims=2) ≈ [1; 1] +end +@test Compat.Statistics.median([1 2; 3 4]) == 2.5 +@test Compat.Statistics.median([1 2; 3 4], dims=1) == [2 3] +@test Compat.Statistics.median([1 2; 3 4], dims=2) == hcat([1.5; 3.5]) +@test Compat.mapreduce(string, *, [1 2; 3 4]) == "1324" +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] +@test Compat.sort([1 2; 3 4], dims=1) == [1 2; 3 4] +@test Compat.sort([1 2; 3 4], dims=2) == [1 2; 3 4] +@test Compat.sort([1, 2, 3, 4], rev=true) == [4, 3, 2, 1] +@test Compat.sort([1 2; 3 4], rev=true, dims=1) == [3 4; 1 2] +@test Compat.sort([1 2; 3 4], rev=true, dims=2) == [2 1; 4 3] +@test Compat.accumulate(*, [1 2; 3 4], dims=1) == [1 2; 3 8] +@test Compat.accumulate(*, [1 2; 3 4], dims=2) == [1 2; 3 12] +@test Compat.cumsum([1 2; 3 4], dims=1) == [1 2; 4 6] +@test Compat.cumsum([1 2; 3 4], dims=2) == [1 3; 3 7] +@test Compat.cumprod([1 2; 3 4], dims=1) == [1 2; 3 8] +@test Compat.cumprod([1 2; 3 4], dims=2) == [1 2; 3 12] +let b = zeros(2,2) + Compat.accumulate!(*, b, [1 2; 3 4], dims=1) + @test b == [1 2; 3 8] + Compat.accumulate!(*, b, [1 2; 3 4], dims=2) + @test b == [1 2; 3 12] + Compat.cumsum!(b, [1 2; 3 4], dims=1) + @test b == [1 2; 4 6] + Compat.cumsum!(b, [1 2; 3 4], dims=2) + @test b == [1 3; 3 7] + Compat.cumprod!(b, [1 2; 3 4], dims=1) + @test b == [1 2; 3 8] + Compat.cumprod!(b, [1 2; 3 4], dims=2) + @test b == [1 2; 3 12] +end +@test Compat.reverse([1, 2, 3, 4]) == [4, 3, 2, 1] +@test Compat.reverse([1 2; 3 4], dims=1) == [3 4; 1 2] +@test Compat.reverse([1 2; 3 4], dims=2) == [2 1; 4 3] + +# 0.7.0-DEV.4738 +if VERSION < v"0.7.0-beta2.143" + @test squeeze([1 2], dims=1) == [1, 2] + @test_throws ArgumentError squeeze([1 2], dims=2) + @test_throws ArgumentError squeeze(hcat([1, 2]), dims=1) + @test squeeze(hcat([1, 2]), dims=2) == [1, 2] + @test_throws Exception squeeze([1,2]) +end + +# 0.7.0-DEV.5165 +@test Compat.cat([1, 2], [3, 4, 5], dims = 1) == [1, 2, 3, 4, 5] +@test Compat.cat([1, 2], [3, 4], dims = 2) == [1 3; 2 4] +if VERSION < v"0.7.0-DEV.5165" + @test_throws UndefKeywordError Compat.cat([1, 2], [3, 4]) +end diff --git a/test/runtests.jl b/test/runtests.jl index a7ad4dbea..4ea6513b1 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -82,166 +82,11 @@ end @test codeunit("foo") == codeunit(SubString("fooαβγ",1,3)) == UInt8 -# 0.7.0-DEV.4064 -# some tests are behind a version check below because Julia gave -# the wrong result between 0.7.0-DEV.3262 and 0.7.0-DEV.4646 -# see https://github.com/JuliaLang/julia/issues/26488 -Issue26488 = VERSION < v"0.7.0-DEV.3262" || VERSION >= v"0.7.0-DEV.4646" -@test Compat.Statistics.mean([1 2; 3 4]) == 2.5 -@test Compat.Statistics.mean([1 2; 3 4], dims=1) == [2 3] -@test Compat.Statistics.mean([1 2; 3 4], dims=2) == hcat([1.5; 3.5]) -@test Compat.cumsum([1 2; 3 4], dims=1) == [1 2; 4 6] -@test Compat.cumsum([1 2; 3 4], dims=2) == [1 3; 3 7] -@test Compat.cumprod([1 2; 3 4], dims=1) == [1 2; 3 8] -@test Compat.cumprod([1 2; 3 4], dims=2) == [1 2; 3 12] -@test Compat.sum([1 2; 3 4]) == 10 -@test Compat.sum([1 2; 3 4], dims=1) == [4 6] -@test Compat.sum([1 2; 3 4], dims=2) == hcat([3; 7]) -@test Compat.sum(x -> x+1, [1 2; 3 4]) == 14 -Issue26488 && @test Compat.sum(x -> x+1, [1 2; 3 4], dims=1) == [6 8] -Issue26488 && @test Compat.sum(x -> x+1, [1 2; 3 4], dims=2) == hcat([5; 9]) -@test Compat.prod([1 2; 3 4]) == 24 -@test Compat.prod([1 2; 3 4], dims=1) == [3 8] -@test Compat.prod([1 2; 3 4], dims=2) == hcat([2; 12]) -@test Compat.prod(x -> x+1, [1 2; 3 4]) == 120 -Issue26488 && @test Compat.prod(x -> x+1, [1 2; 3 4], dims=1) == [8 15] -Issue26488 && @test Compat.prod(x -> x+1, [1 2; 3 4], dims=2) == hcat([6; 20]) -@test Compat.maximum([1 2; 3 4]) == 4 -@test Compat.maximum([1 2; 3 4], dims=1) == [3 4] -@test Compat.maximum([1 2; 3 4], dims=2) == hcat([2; 4]) -@test Compat.maximum(x -> x+1, [1 2; 3 4]) == 5 -@test Compat.maximum(x -> x+1, [1 2; 3 4], dims=1) == [4 5] -@test Compat.maximum(x -> x+1, [1 2; 3 4], dims=2) == hcat([3; 5]) -@test Compat.minimum([1 2; 3 4]) == 1 -@test Compat.minimum([1 2; 3 4], dims=1) == [1 2] -@test Compat.minimum([1 2; 3 4], dims=2) == hcat([1; 3]) -@test Compat.minimum(x -> x+1, [1 2; 3 4]) == 2 -@test Compat.minimum(x -> x+1, [1 2; 3 4], dims=1) == [2 3] -@test Compat.minimum(x -> x+1, [1 2; 3 4], dims=2) == hcat([2; 4]) -@test Compat.all([true false; true false]) == false -@test Compat.all([true false; true false], dims=1) == [true false] -@test Compat.all([true false; true false], dims=2) == hcat([false; false]) -@test Compat.all(isodd, [1 2; 3 4]) == false -@test Compat.all(isodd, [1 2; 3 4], dims=1) == [true false] -@test Compat.all(isodd, [1 2; 3 4], dims=2) == hcat([false; false]) -@test Compat.any([true false; true false]) == true -@test Compat.any([true false; true false], dims=1) == [true false] -@test Compat.any([true false; true false], dims=2) == hcat([true; true]) -@test Compat.any(isodd, [1 2; 3 4]) == true -@test Compat.any(isodd, [1 2; 3 4], dims=1) == [true false] -@test Compat.any(isodd, [1 2; 3 4], dims=2) == hcat([true; true]) -@test Compat.findmax([3, 2, 7, 4]) == (7, 3) -@test Compat.findmax([3, 2, 7, 4], dims=1) == ([7], [3]) -@test Compat.findmax([1 2; 3 4], dims=1) == ([3 4], [CartesianIndex(2, 1) CartesianIndex(2, 2)]) -@test Compat.findmax([1 2; 3 4]) == (4, CartesianIndex(2, 2)) -@test Compat.findmax([1 2; 3 4], dims=1) == ([3 4], [CartesianIndex(2, 1) CartesianIndex(2, 2)]) -@test Compat.findmax([1 2; 3 4], dims=2) == (hcat([2; 4]), hcat([CartesianIndex(1, 2); CartesianIndex(2, 2)])) -@test Compat.findmin([3, 2, 7, 4]) == (2, 2) -@test Compat.findmin([3, 2, 7, 4], dims=1) == ([2], [2]) -@test Compat.findmin([1 2; 3 4]) == (1, CartesianIndex(1, 1)) -@test Compat.findmin([1 2; 3 4], dims=1) == ([1 2], [CartesianIndex(1, 1) CartesianIndex(1, 2)]) -@test Compat.findmin([1 2; 3 4], dims=2) == (hcat([1; 3]), hcat([CartesianIndex(1, 1); CartesianIndex(2, 1)])) -if VERSION < v"0.7.0-DEV.5238" - # Test these functions if their counterparts are defined in Base. In the future, this - # will be dealt with in StatsBase - @test Compat.Statistics.varm([1 2; 3 4], -1) == 18 - @test Compat.Statistics.varm([1 2; 3 4], [-1 -2], dims=1) == [20 52] - @test Compat.Statistics.varm([1 2; 3 4], [-1, -2], dims=2) == hcat([13, 61]) - @test Compat.Statistics.var([1 2; 3 4]) == 5/3 - @test Compat.Statistics.var([1 2; 3 4], dims=1) == [2 2] - @test Compat.Statistics.var([1 2; 3 4], dims=2) == hcat([0.5, 0.5]) - @test Compat.Statistics.var([1 2; 3 4], corrected=false) == 1.25 - @test Compat.Statistics.var([1 2; 3 4], corrected=false, dims=1) == [1 1] - @test Compat.Statistics.var([1 2; 3 4], corrected=false, dims=2) == hcat([0.25, 0.25]) - @test Compat.Statistics.std([1 2; 3 4]) == sqrt(5/3) - @test Compat.Statistics.std([1 2; 3 4], dims=1) == [sqrt(2) sqrt(2)] - @test Compat.Statistics.std([1 2; 3 4], dims=2) == hcat([sqrt(0.5), sqrt(0.5)]) - @test Compat.Statistics.std([1 2; 3 4], corrected=false) == sqrt(1.25) - @test Compat.Statistics.std([1 2; 3 4], corrected=false, dims=1) == [sqrt(1) sqrt(1)] - @test Compat.Statistics.std([1 2; 3 4], corrected=false, dims=2) == hcat([sqrt(0.25), sqrt(0.25)]) - @test Compat.Statistics.cov([1 2; 3 4]) == [2 2; 2 2] - @test Compat.Statistics.cov([1 2; 3 4], dims=1) == [2 2; 2 2] - @test Compat.Statistics.cov([1 2; 3 4], dims=2) == [0.5 0.5; 0.5 0.5] - @test Compat.Statistics.cov([1 2; 3 4], [4; 5]) == hcat([1; 1]) - @test Compat.Statistics.cov([1 2; 3 4], [4; 5], dims=1) == hcat([1; 1]) - @test Compat.Statistics.cov([1 2; 3 4], [4; 5], dims=2) == hcat([0.5; 0.5]) - @test Compat.Statistics.cov([1 2; 3 4], [4; 5], corrected=false) == hcat([0.5; 0.5]) - @test Compat.Statistics.cov([1 2; 3 4], [4; 5], corrected=false, dims=1) == hcat([0.5; 0.5]) - @test Compat.Statistics.cov([1 2; 3 4], [4; 5], corrected=false, dims=2) == hcat([0.25; 0.25]) - @test Compat.Statistics.cor([1 2; 3 4]) ≈ [1 1; 1 1] - @test Compat.Statistics.cor([1 2; 3 4], dims=1) ≈ [1 1; 1 1] - @test Compat.Statistics.cor([1 2; 3 4], dims=2) ≈ [1 1; 1 1] - @test Compat.Statistics.cor([1 2; 3 4], [4; 5]) ≈ [1; 1] - @test Compat.Statistics.cor([1 2; 3 4], [4; 5], dims=1) ≈ [1; 1] - @test Compat.Statistics.cor([1 2; 3 4], [4; 5], dims=2) ≈ [1; 1] -end -@test Compat.Statistics.median([1 2; 3 4]) == 2.5 -@test Compat.Statistics.median([1 2; 3 4], dims=1) == [2 3] -@test Compat.Statistics.median([1 2; 3 4], dims=2) == hcat([1.5; 3.5]) -@test Compat.mapreduce(string, *, [1 2; 3 4]) == "1324" -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] -@test Compat.sort([1 2; 3 4], dims=1) == [1 2; 3 4] -@test Compat.sort([1 2; 3 4], dims=2) == [1 2; 3 4] -@test Compat.sort([1, 2, 3, 4], rev=true) == [4, 3, 2, 1] -@test Compat.sort([1 2; 3 4], rev=true, dims=1) == [3 4; 1 2] -@test Compat.sort([1 2; 3 4], rev=true, dims=2) == [2 1; 4 3] -@test Compat.accumulate(*, [1 2; 3 4], dims=1) == [1 2; 3 8] -@test Compat.accumulate(*, [1 2; 3 4], dims=2) == [1 2; 3 12] -@test Compat.cumsum([1 2; 3 4], dims=1) == [1 2; 4 6] -@test Compat.cumsum([1 2; 3 4], dims=2) == [1 3; 3 7] -@test Compat.cumprod([1 2; 3 4], dims=1) == [1 2; 3 8] -@test Compat.cumprod([1 2; 3 4], dims=2) == [1 2; 3 12] -let b = zeros(2,2) - Compat.accumulate!(*, b, [1 2; 3 4], dims=1) - @test b == [1 2; 3 8] - Compat.accumulate!(*, b, [1 2; 3 4], dims=2) - @test b == [1 2; 3 12] - Compat.cumsum!(b, [1 2; 3 4], dims=1) - @test b == [1 2; 4 6] - Compat.cumsum!(b, [1 2; 3 4], dims=2) - @test b == [1 3; 3 7] - Compat.cumprod!(b, [1 2; 3 4], dims=1) - @test b == [1 2; 3 8] - Compat.cumprod!(b, [1 2; 3 4], dims=2) - @test b == [1 2; 3 12] -end -@test Compat.reverse([1, 2, 3, 4]) == [4, 3, 2, 1] -@test Compat.reverse([1 2; 3 4], dims=1) == [3 4; 1 2] -@test Compat.reverse([1 2; 3 4], dims=2) == [2 1; 4 3] # Issue #523 @test length(Compat.CartesianIndices((1:1,))) == 1 @test length(Compat.CartesianIndices((1:2,))) == 2 @test length(Compat.CartesianIndices((1:2, -1:1))) == 6 -# 0.7.0-DEV.4738 -if VERSION < v"0.7.0-beta2.143" - @test squeeze([1 2], dims=1) == [1, 2] - @test_throws ArgumentError squeeze([1 2], dims=2) - @test_throws ArgumentError squeeze(hcat([1, 2]), dims=1) - @test squeeze(hcat([1, 2]), dims=2) == [1, 2] - @test_throws Exception squeeze([1,2]) -end - -# 0.7.0-DEV.5165 -@test Compat.cat([1, 2], [3, 4, 5], dims = 1) == [1, 2, 3, 4, 5] -@test Compat.cat([1, 2], [3, 4], dims = 2) == [1 3; 2 4] -if VERSION < v"0.7.0-DEV.5165" - @test_throws UndefKeywordError Compat.cat([1, 2], [3, 4]) -end - # 0.7.0-DEV.3976 let A = rand(5,5) @test selectdim(A, 1, 3) == A[3, :]