Skip to content

Commit 676531b

Browse files
fix tests and depwarns
1 parent 91bdd33 commit 676531b

File tree

6 files changed

+15
-18
lines changed

6 files changed

+15
-18
lines changed

REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
julia 0.7-alpha
1+
julia 0.7-beta2
22
Requires
33
RecipesBase 0.1.0
44
StaticArrays

src/array_partition.jl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,11 @@ end
4949
Base.copy(A::ArrayPartition{T,S}) where {T,S} = ArrayPartition{T,S}(copy.(A.x))
5050

5151
## zeros
52-
5352
Base.zero(A::ArrayPartition{T,S}) where {T,S} = ArrayPartition{T,S}(zero.(A.x))
54-
Base.zeros(A::ArrayPartition{T,S}) where {T,S} = ArrayPartition{T,S}(zeros.(A.x))
55-
5653
# ignore dims since array partitions are vectors
57-
Base.zeros(A::ArrayPartition, dims::NTuple{N,Int}) where {N} = zeros(A)
54+
Base.zero(A::ArrayPartition, dims::NTuple{N,Int}) where {N} = zero(A)
55+
56+
5857

5958
## ones
6059

src/utils.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Base.@pure recursive_unitless_eltype(a::Type{T}) where {T<:Number} = typeof(one(
106106

107107
recursive_mean(x...) = mean(x...)
108108
function recursive_mean(vecvec::Vector{T}) where T<:AbstractArray
109-
out = zeros(vecvec[1])
109+
out = zero(vecvec[1])
110110
for i in eachindex(vecvec)
111111
out+= vecvec[i]
112112
end

test/partitions_test.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ x = ArrayPartition([1, 2], [3.0, 4.0])
4949
@inferred similar(x, Int, (2, 2))
5050
@inferred similar(x, Int, Float64)
5151

52-
# zeros
53-
@inferred zeros(x)
54-
@inferred zeros(x, (2,2))
52+
# zero
53+
@inferred zero(x)
54+
@inferred zero(x, (2,2))
5555
@inferred zero(x)
5656

5757
# ones

test/runtests.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using RecursiveArrayTools
22
using Test
33

4-
tic()
5-
@time @testset "Utils Tests" begin include("utils_test.jl") end
6-
@time @testset "Partitions Tests" begin include("partitions_test.jl") end
7-
@time @testset "VecOfArr Indexing Tests" begin include("basic_indexing.jl") end
8-
@time @testset "VecOfArr Interface Tests" begin include("interface_tests.jl") end
9-
@time @testset "StaticArrays Tests" begin include("copy_static_array_test.jl") end
10-
toc()
4+
@time begin
5+
@time @testset "Utils Tests" begin include("utils_test.jl") end
6+
@time @testset "Partitions Tests" begin include("partitions_test.jl") end
7+
@time @testset "VecOfArr Indexing Tests" begin include("basic_indexing.jl") end
8+
@time @testset "VecOfArr Interface Tests" begin include("interface_tests.jl") end
9+
@time @testset "StaticArrays Tests" begin include("copy_static_array_test.jl") end
10+
end

test/utils_test.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ A = [[1 2; 3 4],[1 3;4 6],[5 6;7 8]]
1414
A = zeros(5,5)
1515
recursive_unitless_eltype(A) == Float64
1616

17-
#=
1817
using Unitful
1918
A = zeros(5,5)*1u"kg"
2019
recursive_unitless_eltype(A) == Float64
@@ -28,4 +27,3 @@ AofuSA = [@SVector [2.0u"kg",3.0u"kg"] for i in 1:5]
2827
recursive_unitless_eltype(AofuSA) == SVector{2,Float64}
2928

3029
@inferred recursive_unitless_eltype(AofuSA)
31-
=#

0 commit comments

Comments
 (0)