File tree 2 files changed +2
-1
lines changed 2 files changed +2
-1
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ function Base.cat(inputs::ComponentArray...; dims::Int)
20
20
combined_data = cat (getdata .(inputs)... ; dims= dims)
21
21
axes_to_merge = [(getaxes (i)... , FlatAxis ())[dims] for i in inputs]
22
22
rest_axes = [getaxes (i)[1 : end .!= dims] for i in inputs]
23
- no_duplicate_keys = (length (inputs) == 1 || isempty ( intersect ( keys .(axes_to_merge)... )))
23
+ no_duplicate_keys = (length (inputs) == 1 || allunique ( vcat ( collect .( keys .(axes_to_merge) )... )))
24
24
if no_duplicate_keys && length (Set (rest_axes)) == 1
25
25
offsets = (0 , cumsum (size .(inputs, dims))[1 : (end - 1 )]. .. )
26
26
merged_axis = Axis (merge (indexmap .(reindex .(axes_to_merge, offsets))... ))
Original file line number Diff line number Diff line change 482
482
@test ldiv! (tempmat, lu (cmat + I), cmat) isa ComponentMatrix
483
483
@test ldiv! (getdata (tempmat), lu (cmat + I), cmat) isa AbstractMatrix
484
484
485
+ @test ! (vcat (ca, ca2, ca) isa ComponentVector)
485
486
for n in 1 : 3 # Issue 168 cats (on more than one) ComponentArrays
486
487
vca2 = vcat (repeat ([ca2' ], n)... )
487
488
hca2 = hcat (repeat ([ca2], n)... )
You can’t perform that action at this time.
0 commit comments