Skip to content

Commit befd85b

Browse files
author
Michael Abbott
committed
simplify similar_vector & generators
1 parent a06a636 commit befd85b

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/LazyStack.jl

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ function vstack_plus(itr)
206206
s = size(val)
207207
n = Base.haslength(itr) ? prod(s)*length(itr) : nothing
208208

209-
v = similar_vector(val, something(n, prod(s)))
209+
v = similar_vector(no_wraps(val), something(n, prod(s)))
210210
copyto!(v, 1, no_wraps(val), 1, prod(s))
211211

212212
w = stack_rest(v, 0, n, s, itr, state)::Vector
@@ -275,8 +275,6 @@ using OffsetArrays
275275
no_wraps(a) = a
276276
no_wraps(a::OffsetArray) = parent(a)
277277

278-
similar_vector(a::OffsetArray, n::Int) = similar_vector(parent(a), n)
279-
280278
rewrap_like(A, a) = A
281279
function rewrap_like(A, a::OffsetArray)
282280
B = rewrap_like(A, parent(a))
@@ -287,8 +285,6 @@ end
287285

288286
using NamedDims
289287

290-
similar_vector(a::NamedDimsArray, n::Int) = similar_vector(parent(a), n)
291-
292288
ensure_named(a::AbstractArray, L::Tuple) = NamedDimsArray(a, L)
293289
ensure_named(a::NamedDimsArray, L::Tuple) = refine_names(a, L)
294290

@@ -303,12 +299,13 @@ getnames(xs::AbstractArray{<:AbstractArray}) =
303299

304300
# tuple of arrays
305301
stack(x::AT) where {AT <: Tuple{Vararg{NamedDimsArray{L,T,IN}}}} where {T,IN,L} =
306-
ensure_named(stack(map(parent,x)), getnames(x))
302+
ensure_named(stack(map(parent, x)), getnames(x))
307303

308304
getnames(xs::Tuple{Vararg{<:NamedDimsArray}}) =
309305
(dimnames(first(xs))..., :_)
310306

311307
# generators
308+
#=
312309
function stack(xs::Base.Generator{<:NamedDimsArray{L}}) where {L}
313310
w = stack_iter(xs)
314311
l = (ntuple(_ -> :_, ndims(w)-length(L))..., L...)
@@ -321,6 +318,7 @@ function stack(xs::Base.Generator{<:Iterators.ProductIterator{<:Tuple{<:NamedDim
321318
l = (ntuple(_ -> :_, ndims(w)-length(L))..., L...)
322319
ensure_named(w, l)
323320
end
321+
=#
324322

325323
function rewrap_like(A, a::NamedDimsArray{L}) where {L}
326324
B = rewrap_like(A, parent(a))

0 commit comments

Comments
 (0)