Merge branch 'master' into lastindex-ragged

Author: JoshuaLampert

Project.toml

@@ -1,7 +1,7 @@
 name = "RecursiveArrayTools"
 uuid = "731186ca-8d62-57ce-b412-fbd966d074cd"
 authors = ["Chris Rackauckas <accounts@chrisrackauckas.com>"]
-version = "3.40.0"
+version = "3.41.0"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

src/array_partition.jl

@@ -329,6 +329,19 @@ function recursivecopy!(A::ArrayPartition, B::ArrayPartition)
 end
 recursivecopy(A::ArrayPartition) = ArrayPartition(copy.(A.x))
 
+function recursivecopy(A::ArrayPartition{
+        T, S}) where {T, S <: Tuple{Vararg{AbstractVectorOfArray}}}
+    return ArrayPartition(map(recursivecopy, A.x))
+end
+
+function recursivecopy!(A::ArrayPartition{T, S},
+        B::ArrayPartition{T, S}) where {T, S <: Tuple{Vararg{AbstractVectorOfArray}}}
+    for i in eachindex(A.x, B.x)
+        recursivecopy!(A.x[i], B.x[i])
+    end
+    return A
+end
+
 recursive_mean(A::ArrayPartition) = mean((recursive_mean(x) for x in A.x))
 
 # note: consider only first partition for recursive one and eltype
@@ -475,7 +488,7 @@ end
 ## Linear Algebra
 
 function ArrayInterface.zeromatrix(A::ArrayPartition)
-    x = reduce(vcat,vec.(A.x))
+    x = reduce(vcat, vec.(A.x))
     x .* x' .* false
 end
 

test/partitions_test.jl

@@ -132,6 +132,23 @@ y = ArrayPartition(ArrayPartition([1], [2.0]), ArrayPartition([3], [4.0]))
 @inferred recursive_one(x)
 @inferred recursive_bottom_eltype(x)
 
+src_voa = VectorOfArray([[1.0, 2.0], [3.0, 4.0]])
+src_ap = ArrayPartition(src_voa)
+
+copied_ap = recursivecopy(src_ap)
+@test copied_ap.x[1].u[1] == src_ap.x[1].u[1]
+@test copied_ap.x[1].u[2] == src_ap.x[1].u[2]
+@test copied_ap.x[1].u[1] !== src_ap.x[1].u[1]
+@test copied_ap.x[1].u[2] !== src_ap.x[1].u[2]
+
+dest_voa = VectorOfArray([zeros(2), zeros(2)])
+dest_ap = ArrayPartition(dest_voa)
+recursivecopy!(dest_ap, src_ap)
+@test dest_ap.x[1].u[1] == src_ap.x[1].u[1]
+@test dest_ap.x[1].u[2] == src_ap.x[1].u[2]
+@test dest_ap.x[1].u[1] !== src_ap.x[1].u[1]
+@test dest_ap.x[1].u[2] !== src_ap.x[1].u[2]
+
 # mapreduce
 @inferred Union{Int, Float64} sum(x)
 @inferred sum(ArrayPartition(ArrayPartition(zeros(4, 4))))
@@ -149,7 +166,7 @@ y = ArrayPartition(ArrayPartition([1], [2.0]), ArrayPartition([3], [4.0]))
 @test any(isnan, ArrayPartition([2], [NaN]))
 @test any(isnan, ArrayPartition([2], ArrayPartition([NaN])))
 
-# all 
+# all
 @test !all(isnan, ArrayPartition([1, 2], [3.0, 4.0]))
 @test !all(isnan, ArrayPartition([3.0, 4.0]))
 @test !all(isnan, ArrayPartition([NaN], [3.0, 4.0]))