@@ -80,13 +80,11 @@ ArrayOfSimilarArrays(A::AbstractArray{<:AbstractArray{T,M},N}) where {T,M,N} =
80
80
ArrayOfSimilarArrays {T,M,N} (A)
81
81
82
82
83
- @static if VERSION < v " 0.7.0-DEV.3138"
84
- Base. convert (R:: Type{ArrayOfSimilarArrays{T,M,N}} , parent:: AbstractArray{U,L} ) where {T,M,N,L,U} = R (parent)
83
+ Base. convert (R:: Type{ArrayOfSimilarArrays{T,M,N}} , parent:: AbstractArray{U,L} ) where {T,M,N,L,U} = R (parent)
85
84
86
- Base. convert (R:: Type{ArrayOfSimilarArrays{T,M,N}} , A:: AbstractArray{<:AbstractArray{U,M},N} ) where {T,M,N,U} = R (A)
87
- Base. convert (R:: Type{ArrayOfSimilarArrays{T}} , A:: AbstractArray{<:AbstractArray{U,M},N} ) where {T,M,N,U} = R (A)
88
- Base. convert (R:: Type{ArrayOfSimilarArrays} , A:: AbstractArray{<:AbstractArray{T,M},N} ) where {T,M,N} = R (A)
89
- end
85
+ Base. convert (R:: Type{ArrayOfSimilarArrays{T,M,N}} , A:: AbstractArray{<:AbstractArray{U,M},N} ) where {T,M,N,U} = R (A)
86
+ Base. convert (R:: Type{ArrayOfSimilarArrays{T}} , A:: AbstractArray{<:AbstractArray{U,M},N} ) where {T,M,N,U} = R (A)
87
+ Base. convert (R:: Type{ArrayOfSimilarArrays} , A:: AbstractArray{<:AbstractArray{T,M},N} ) where {T,M,N} = R (A)
90
88
91
89
92
90
function _size_inner (A:: AbstractArray{<:AbstractArray{T,M},N} ) where {T,M,N}
@@ -132,11 +130,6 @@ Base.@propagate_inbounds Base.setindex!(A::ArrayOfSimilarArrays{T,M,N}, x::Abstr
132
130
setindex! (A. data, x, _ncolons (Val {M} ())... , idxs... )
133
131
134
132
135
- @static if VERSION < v " 0.7.0-DEV.2791"
136
- Base. repremptyarray (io:: IO , X:: ArrayOfSimilarArrays{T,M,N,L,P} ) where {T,M,N,L,P} = print (io, " ArrayOfSimilarArrays{$T ,$M ,$N ,$L ,$P }(" , join (size (X),' ,' ), ' )' )
137
- end
138
-
139
-
140
133
@inline function Base. resize! (A:: ArrayOfSimilarArrays{T,M,N} , dims:: Vararg{Integer,N} ) where {T,M,N}
141
134
resize! (A. data, _size_inner (A)... , dims... )
142
135
A
@@ -213,11 +206,9 @@ VectorOfSimilarArrays(A::AbstractVector{<:AbstractArray{T,M}}) where {T,M} =
213
206
VectorOfSimilarArrays {T,M} (A)
214
207
215
208
216
- @static if VERSION < v " 0.7.0-DEV.3138"
217
- Base. convert (R:: Type{VectorOfSimilarArrays{T}} , parent:: AbstractArray{U,L} ) where {T,U,L} = R (parent)
218
- Base. convert (R:: Type{VectorOfSimilarArrays{T}} , A:: AbstractVector{<:AbstractArray{U,M}} ) where {T,M,U} = R (A)
219
- Base. convert (R:: Type{VectorOfSimilarArrays} , A:: AbstractVector{<:AbstractArray{T,M}} ) where {T,M} = R (A)
220
- end
209
+ Base. convert (R:: Type{VectorOfSimilarArrays{T}} , parent:: AbstractArray{U,L} ) where {T,U,L} = R (parent)
210
+ Base. convert (R:: Type{VectorOfSimilarArrays{T}} , A:: AbstractVector{<:AbstractArray{U,M}} ) where {T,M,U} = R (A)
211
+ Base. convert (R:: Type{VectorOfSimilarArrays} , A:: AbstractVector{<:AbstractArray{T,M}} ) where {T,M} = R (A)
221
212
222
213
223
214
@inline Base. IndexStyle (V:: VectorOfSimilarArrays ) = IndexLinear ()
@@ -264,11 +255,9 @@ ArrayOfSimilarVectors(A::AbstractArray{<:AbstractVector{T},N}) where {T,N} =
264
255
ArrayOfSimilarVectors {T,N} (A)
265
256
266
257
267
- @static if VERSION < v " 0.7.0-DEV.3138"
268
- Base. convert (R:: Type{ArrayOfSimilarVectors{T}} , parent:: AbstractArray{U,L} ) where {T,U,L} = R (parent)
269
- Base. convert (R:: Type{ArrayOfSimilarVectors{T}} , A:: AbstractArray{<:AbstractVector{U},N} ) where {T,N,U} = R (A)
270
- Base. convert (R:: Type{ArrayOfSimilarVectors} , A:: AbstractArray{<:AbstractVector{T},N} ) where {T,N} = R (A)
271
- end
258
+ Base. convert (R:: Type{ArrayOfSimilarVectors{T}} , parent:: AbstractArray{U,L} ) where {T,U,L} = R (parent)
259
+ Base. convert (R:: Type{ArrayOfSimilarVectors{T}} , A:: AbstractArray{<:AbstractVector{U},N} ) where {T,N,U} = R (A)
260
+ Base. convert (R:: Type{ArrayOfSimilarVectors} , A:: AbstractArray{<:AbstractVector{T},N} ) where {T,N} = R (A)
272
261
273
262
274
263
const VectorOfSimilarVectors{
@@ -290,9 +279,7 @@ VectorOfSimilarVectors{T}(A::AbstractVector{<:AbstractVector{U}}) where {T,U} =
290
279
VectorOfSimilarVectors (A:: AbstractVector{<:AbstractVector{T}} ) where {T} =
291
280
VectorOfSimilarVectors {T} (A)
292
281
293
- @static if VERSION < v " 0.7.0-DEV.3138"
294
- Base. convert (R:: Type{VectorOfSimilarVectors{T}} , parent:: AbstractArray{U,2} ) where {T,U} = R (parent)
295
- Base. convert (R:: Type{VectorOfSimilarVectors} , parent:: AbstractArray{T,2} ) where {T} = R (parent)
296
- Base. convert (R:: Type{VectorOfSimilarVectors{T}} , A:: AbstractVector{<:AbstractVector{U}} ) where {T,U} = R (A)
297
- Base. convert (R:: Type{VectorOfSimilarVectors} , A:: AbstractVector{<:AbstractVector{T}} ) where {T} = R (A)
298
- end
282
+ Base. convert (R:: Type{VectorOfSimilarVectors{T}} , parent:: AbstractArray{U,2} ) where {T,U} = R (parent)
283
+ Base. convert (R:: Type{VectorOfSimilarVectors} , parent:: AbstractArray{T,2} ) where {T} = R (parent)
284
+ Base. convert (R:: Type{VectorOfSimilarVectors{T}} , A:: AbstractVector{<:AbstractVector{U}} ) where {T,U} = R (A)
285
+ Base. convert (R:: Type{VectorOfSimilarVectors} , A:: AbstractVector{<:AbstractVector{T}} ) where {T} = R (A)
0 commit comments