Merge pull request #31 from JuliaDiffEq/ChrisRackauckas-patch-1

Bump to v0.7

Author: ChrisRackauckas

.travis.yml

@@ -3,7 +3,7 @@ language: julia
 os:
   - linux
 julia:
-  - 0.6
+  - 0.7
   - nightly
 matrix:
   allow_failures:

REQUIRE

@@ -1,4 +1,4 @@
-julia 0.6
+julia 0.7-alpha
 Requires
 RecipesBase 0.1.0
 StaticArrays

appveyor.yml

@@ -1,7 +1,7 @@
 environment:
   matrix:
-    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
+    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
     - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
     - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 matrix:

src/RecursiveArrayTools.jl

@@ -2,7 +2,7 @@ __precompile__()
 
 module RecursiveArrayTools
 
-  using Requires, RecipesBase, StaticArrays
+  using Requires, RecipesBase, StaticArrays, Statistics
 
   abstract type AbstractVectorOfArray{T, N} <: AbstractArray{T, N} end
   abstract type AbstractDiffEqArray{T, N} <: AbstractVectorOfArray{T, N} end
@@ -11,7 +11,7 @@ module RecursiveArrayTools
   include("vector_of_array.jl")
   include("array_partition.jl")
   include("juno_rendering.jl")
-  
+
   export VectorOfArray, DiffEqArray, AbstractVectorOfArray, AbstractDiffEqArray,
          vecarr_to_arr, vecarr_to_vectors, tuples
 

src/array_partition.jl

@@ -4,7 +4,7 @@ end
 
 ## constructors
 
-ArrayPartition(x...) = ArrayPartition((x...))
+ArrayPartition(x...) = ArrayPartition((x...,))
 
 function ArrayPartition(x::S, ::Type{Val{copy_x}}=Val{false}) where {S<:Tuple,copy_x}
   T = promote_type(eltype.(x)...)
@@ -124,7 +124,7 @@ end
 
 Base.mapreduce(f,op,A::ArrayPartition) = mapreduce(f,op,(mapreduce(f,op,x) for x in A.x))
 Base.any(f,A::ArrayPartition) = any(f,(any(f,x) for x in A.x))
-function Base.copy!(dest::Array,A::ArrayPartition)
+function Base.copyto!(dest::Array,A::ArrayPartition)
     @assert length(dest) == length(A)
     cur = 1
     @inbounds for i in 1:length(A.x)
@@ -133,7 +133,7 @@ function Base.copy!(dest::Array,A::ArrayPartition)
     end
 end
 
-function Base.copy!(A::ArrayPartition,src::ArrayPartition)
+function Base.copyto!(A::ArrayPartition,src::ArrayPartition)
     @assert length(src) == length(A)
     cur = 1
     @inbounds for i in 1:length(A.x)
@@ -145,12 +145,8 @@ end
 ## indexing
 
 # Interface for the linear indexing. This is just a view of the underlying nested structure
-@static if VERSION >= v"0.7-"
-  @inline Base.firstindex(A::ArrayPartition) = 1
-  @inline Base.lastindex(A::ArrayPartition) = length(A)
-else
-  @inline Base.endof(A::ArrayPartition) = length(A)
-end
+@inline Base.firstindex(A::ArrayPartition) = 1
+@inline Base.lastindex(A::ArrayPartition) = length(A)
 
 @inline function Base.getindex(A::ArrayPartition, i::Int)
   @boundscheck checkbounds(A, i)
@@ -220,9 +216,8 @@ recursive_eltype(A::ArrayPartition) = recursive_eltype(first(A.x))
 
 ## iteration
 
-Base.start(A::ArrayPartition) = start(Chain(A.x))
-Base.next(A::ArrayPartition,state) = next(Chain(A.x),state)
-Base.done(A::ArrayPartition,state) = done(Chain(A.x),state)
+Base.iterate(A::ArrayPartition) = iterate(Chain(A.x))
+Base.iterate(A::ArrayPartition,state) = iterate(Chain(A.x),state)
 
 Base.length(A::ArrayPartition) = sum((length(x) for x in A.x))
 Base.size(A::ArrayPartition) = (length(A),)
@@ -238,14 +233,19 @@ Base.show(io::IO, m::MIME"text/plain", A::ArrayPartition) = show(io, m, A.x)
 
 ## broadcasting
 
-Base.Broadcast._containertype(::Type{<:ArrayPartition}) = ArrayPartition
-Base.Broadcast.promote_containertype(::Type{ArrayPartition}, ::Type) = ArrayPartition
-Base.Broadcast.promote_containertype(::Type, ::Type{ArrayPartition}) = ArrayPartition
-Base.Broadcast.promote_containertype(::Type{ArrayPartition}, ::Type{ArrayPartition}) = ArrayPartition
-Base.Broadcast.promote_containertype(::Type{ArrayPartition}, ::Type{Array}) = ArrayPartition
-Base.Broadcast.promote_containertype(::Type{Array}, ::Type{ArrayPartition}) = ArrayPartition
+struct APStyle <: Broadcast.BroadcastStyle end
+Base.BroadcastStyle(::Type{<:ArrayPartition}) = Broadcast.ArrayStyle{ArrayPartition}()
+Base.BroadcastStyle(::Broadcast.ArrayStyle{ArrayPartition},::Broadcast.ArrayStyle) = Broadcast.Style{ArrayPartition}()
+Base.BroadcastStyle(::Broadcast.ArrayStyle,::Broadcast.ArrayStyle{ArrayPartition}) = Broadcast.Style{ArrayPartition}()
+Base.similar(bc::Broadcast.Broadcasted{Broadcast.ArrayStyle{ArrayPartition}},::Type{ElType}) where ElType = similar(bc)
+
+function Base.copy(bc::Broadcast.Broadcasted{Broadcast.ArrayStyle{ArrayPartition}})
+    ret = Broadcast.flatten(bc)
+    __broadcast(ret.f,ret.args...)
+end
+
+@generated function __broadcast(f,as...)
 
-@generated function Base.Broadcast.broadcast_c(f, ::Type{ArrayPartition}, as...)
     # common number of partitions
     N = npartitions(as...)
 
@@ -254,12 +254,15 @@ Base.Broadcast.promote_containertype(::Type{Array}, ::Type{ArrayPartition}) = Ar
                        # index partitions
                        $((as[d] <: ArrayPartition ? :(as[$d].x[i]) : :(as[$d])
                           for d in 1:length(as))...)))
-
     build_arraypartition(N, expr)
 end
 
-@generated function Base.Broadcast.broadcast_c!(f, ::Type{ArrayPartition}, ::Type,
-                                     dest::ArrayPartition, as...)
+function Base.copyto!(dest::AbstractArray,bc::Broadcast.Broadcasted{Broadcast.ArrayStyle{ArrayPartition}})
+    ret = Broadcast.flatten(bc)
+    __broadcast!(ret.f,dest,ret.args...)
+end
+
+@generated function __broadcast!(f, dest, as...)
     # common number of partitions
     N = npartitions(dest, as...)
 

src/utils.jl

@@ -26,7 +26,7 @@ function recursivecopy!(b::AbstractArray{T,N},a::AbstractArray{T2,N}) where {T<:
 end
 
 function recursivecopy!(b::AbstractArray{T,N},a::AbstractArray{T2,N}) where {T<:Number,T2<:Number,N}
-  copy!(b,a)
+  copyto!(b,a)
 end
 
 function recursivecopy!(b::AbstractArray{T,N},a::AbstractArray{T2,N}) where {T<:AbstractArray,T2<:AbstractArray,N}
@@ -145,30 +145,24 @@ Base.length(it::Chain) = sum(length, it.xss)
 
 Base.eltype(::Type{Chain{T}}) where {T} = typejoin([eltype(t) for t in T.parameters]...)
 
-function Base.start(it::Chain)
+function Base.iterate(it::Chain)
     i = 1
     xs_state = nothing
     while i <= length(it.xss)
-        xs_state = start(it.xss[i])
-        if !done(it.xss[i], xs_state)
-            break
-        end
+        xs_state = iterate(it.xss[i])
+        xs_state !== nothing && return xs_state[1], (i, xs_state[2])
         i += 1
     end
-    return i, xs_state
+    return nothing
 end
 
-function Base.next(it::Chain, state)
+function Base.iterate(it::Chain, state)
     i, xs_state = state
-    v, xs_state = next(it.xss[i], xs_state)
-    while done(it.xss[i], xs_state)
+    xs_state = iterate(it.xss[i], xs_state)
+    while xs_state == nothing
         i += 1
-        if i > length(it.xss)
-            break
-        end
-        xs_state = start(it.xss[i])
+        i > length(it.xss) && return nothing
+        xs_state = iterate(it.xss[i])
     end
-    return v, (i, xs_state)
+    return xs_state[1], (i, xs_state[2])
 end
-
-Base.done(it::Chain, state) = state[1] > length(it.xss)

src/vector_of_array.jl

@@ -18,16 +18,12 @@ DiffEqArray(vec::AbstractVector,ts::AbstractVector) = DiffEqArray(vec, ts, (size
 
 
 # Interface for the linear indexing. This is just a view of the underlying nested structure
-@static if VERSION >= v"0.7-"
-  @inline Base.firstindex(VA::AbstractVectorOfArray) = firstindex(VA.u)
-  @inline Base.lastindex(VA::AbstractVectorOfArray) = lastindex(VA.u)
-else
-  @inline Base.endof(VA::AbstractVectorOfArray) = endof(VA.u)
-end
+@inline Base.firstindex(VA::AbstractVectorOfArray) = firstindex(VA.u)
+@inline Base.lastindex(VA::AbstractVectorOfArray) = lastindex(VA.u)
 
 @inline Base.length(VA::AbstractVectorOfArray) = length(VA.u)
 @inline Base.eachindex(VA::AbstractVectorOfArray) = Base.OneTo(length(VA.u))
-@inline Base.iteratorsize(VA::AbstractVectorOfArray) = Base.HasLength()
+@inline Base.IteratorSize(VA::AbstractVectorOfArray) = Base.HasLength()
 # Linear indexing will be over the container elements, not the individual elements
 # unlike an true AbstractArray
 @inline Base.getindex(VA::AbstractVectorOfArray{T, N}, I::Int) where {T, N} = VA.u[I]
@@ -83,6 +79,8 @@ end
 # Need this for ODE_DEFAULT_UNSTABLE_CHECK from DiffEqBase to work properly
 @inline Base.any(f, VA::AbstractVectorOfArray) = any(any(f,VA[i]) for i in eachindex(VA))
 @inline Base.all(f, VA::AbstractVectorOfArray) = all(all(f,VA[i]) for i in eachindex(VA))
+@inline Base.any(f::Function, VA::AbstractVectorOfArray) = any(any(f,VA[i]) for i in eachindex(VA))
+@inline Base.all(f::Function, VA::AbstractVectorOfArray) = all(all(f,VA[i]) for i in eachindex(VA))
 
 # conversion tools
 @deprecate vecarr_to_arr(VA::AbstractVectorOfArray) convert(Array,VA)

test/basic_indexing.jl

@@ -2,7 +2,7 @@ using RecursiveArrayTools
 
 # Example Problem
 recs = [[1, 2, 3], [4, 5, 6], [7, 8, 9]]
-testa = cat(2, recs...)
+testa = cat(recs..., dims=2)
 testva = VectorOfArray(recs)
 t = [1,2,3]
 diffeq = DiffEqArray(recs,t)
@@ -13,7 +13,7 @@ testa[1:2, 1:2] == [1 4; 2 5]
 
 # # ndims == 2
 recs = [rand(8) for i in 1:10]
-testa = cat(2, recs...)
+testa = cat(recs...,dims=2)
 testva = VectorOfArray(recs)
 
 # ## Linear indexing
@@ -36,7 +36,7 @@ testva = VectorOfArray(recs)
 
 # # ndims == 3
 recs = recs = [rand(10, 8) for i in 1:15]
-testa = cat(3, recs...)
+testa = cat(recs...,dims=3)
 testva = VectorOfArray(recs)
 
 # ## (Int, Int, Int)
@@ -65,11 +65,11 @@ testva = VectorOfArray(recs)
 
 # ## Test ragged arrays work, or give errors as needed
 #TODO: I am not really sure what the behavior of this is, what does Mathematica do?
-recs = [[1, 2, 3], [3 5; 6 7], [8, 9, 10, 11]]
+recs = [[1, 2, 3], [3, 5, 6, 7], [8, 9, 10, 11]]
 testva = VectorOfArray(recs) #TODO: clearly this printed form is nonsense
 @test testva[:, 1] == recs[1]
 testva[1:2, 1:2]
 
 # Test broadcast
 a = testva .+ rand(3,3)
-a.= testva
+@test_broken a.= testva

test/copy_static_array_test.jl

@@ -1,4 +1,4 @@
-using Base.Test, RecursiveArrayTools, StaticArrays
+using Test, RecursiveArrayTools, StaticArrays
 
 struct ImmutableFV <: FieldVector{2,Float64}
     a::Float64
@@ -13,7 +13,7 @@ end
 # Immutable FieldVector
 vec = ImmutableFV(1.,2.)
 a = [vec]
-b = zeros(a)
+b = zero(a)
 recursivecopy!(b, a)
 @test a[1] == b[1]
 copyat_or_push!(a, 2, b[1])
@@ -25,7 +25,7 @@ copyat_or_push!(a, 2, b[1])
 # Mutable FieldVector
 vec = MutableFV(1.,2.)
 a = [vec]
-b = zeros(a)
+b = zero(a)
 recursivecopy!(b, a)
 @test a[1] == b[1]
 a[1][1] *= 5
@@ -41,7 +41,7 @@ copyat_or_push!(a, 2, b[1])
 # SArray
 vec = @SArray [1., 2.]
 a = [vec]
-b = zeros(a)
+b = zero(a)
 recursivecopy!(b, a)
 @test a[1] == b[1]
 copyat_or_push!(a, 2, b[1])
@@ -53,7 +53,7 @@ copyat_or_push!(a, 2, b[1])
 # MArray
 vec = @MArray [1., 2.]
 a = [vec]
-b = zeros(a)
+b = zero(a)
 recursivecopy!(b, a)
 a[1][1] *= 5
 @test a[1] != b[1]

test/interface_tests.jl

@@ -1,4 +1,4 @@
-using RecursiveArrayTools, Base.Test
+using RecursiveArrayTools, Test
 
 recs = [[1, 2, 3], [4, 5, 6], [7, 8, 9]]
 testva = VectorOfArray(recs)
@@ -36,7 +36,7 @@ testva[4, 9] # == testva.data[9][4]
 # convert array from VectorOfArray
 recs = [rand(10, 7) for i = 1:8]
 testva = VectorOfArray(recs)
-testa = cat(3, recs...)
+testa = cat(recs...,dims=3)
 @test convert(Array,testva) == testa
 
 recs = [[1, 2, 3], [3 5; 6 7], [8, 9, 10, 11]]
@@ -54,7 +54,7 @@ testva2 = similar(testva)
 testval = 3.0
 fill!(testva2, testval)
 @test all(x->(x==testval), testva2)
-testts = rand(size(testva.u))
+testts = rand(Float64, size(testva.u))
 testda = DiffEqArray(recursivecopy(testva.u), testts)
 fill!(testda, testval)
 @test all(x->(x==testval), testda)