Skip to content

Modify condition in MultiDimClosure function #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zinoex wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Modify condition in MultiDimClosure function #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cde427a
Modify condition in MultiDimClosure function
Zinoex Dec 3, 2025
040dfd4
Merge branch 'JuliaServices:main' into fm/nested_arrays
Zinoex Jan 15, 2026
a16398c
Add ndims to discover_dims
Zinoex Jan 15, 2026
629f3e6
Add tests
Zinoex Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/StructUtils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ initialize(st::StructStyle, T::Type, @nospecialize(source)) =

function initialize(st::StructStyle, ::Type{A}, source) where {A<:AbstractArray}
if ndims(A) > 1
dims = discover_dims(st, source)
dims = discover_dims(st, source, ndims(A))
return A(undef, dims)
else
return A(undef, 0)
Expand Down Expand Up @@ -660,12 +660,16 @@ end # VERSION < v"1.10"
# "[[[1.0],[2.0]]]" => (1, 2, 1)
# "[[[1.0,2.0]]]" => (2, 1, 1)
# length of innermost array is 1st dim
function discover_dims(style, x)
function discover_dims(style, x, ndims::Int)
@assert arraylike(style, x)
len = applylength(x)
if ndims == 1
return (len,)
end

ret = (
applyeach(x) do _, v
return arraylike(style, v) ? EarlyReturn(discover_dims(style, v)) : EarlyReturn(())
return arraylike(style, v) ? EarlyReturn(discover_dims(style, v, ndims - 1)) : EarlyReturn(())
end
)::EarlyReturn
return (ret.value..., len)
Expand All @@ -680,7 +684,7 @@ end

function (f::MultiDimClosure{S,A})(i::Int, val) where {S,A}
f.dims[f.cur_dim[]] = i
if arraylike(f.style, val)
if arraylike(f.style, val) && f.cur_dim[] > 1
f.cur_dim[] -= 1
st = applyeach(f, f.style, val)
f.cur_dim[] += 1
Expand Down
16 changes: 16 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,22 @@ end
# fill slice [:, :, 2] from second slab [[3,4]]
exp3[:, :, 2] = reshape([3,4], 2, 1)
@test x3 == exp3

# Jagged nested vectors (Vector of Vectors)
jagged = [[1, 2], [3, 4, 5], [6]]
result = StructUtils.make(Vector{Vector{Int}}, jagged)
@test result == jagged

# Multi-dimensional case with jagged inner vectors
vv_jagged = [[[1, 2], [3]], [[4, 5, 6], [7, 8]]]
result_md = StructUtils.make(Array{Vector{Int}, 2}, vv_jagged)

md_jagged = Array{Vector{Int}}(undef, 2, 2)
md_jagged[1, 1] = [1, 2]
md_jagged[2, 1] = [3]
md_jagged[1, 2] = [4, 5, 6]
md_jagged[2, 2] = [7, 8]
@test result_md == md_jagged
end

@testset "@nonstruct macro" begin
Expand Down