Add copy (#60)

JuliaArrays · Oct 3, 2018 · d92f0b4 · d92f0b4
1 parent 0273fed
commit d92f0b4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/src/BlockArrays.jl b/src/BlockArrays.jl
@@ -21,7 +21,7 @@ import Base: @propagate_inbounds, Array, to_indices, to_index,
             broadcast, eltype, convert, broadcast,
             @_inline_meta, _maybetail, tail, @_propagate_inbounds_meta, reindex,
             RangeIndex, Int, Integer, Number,
-            +, -, min, max, *, isless, in, copyto!, axes, @deprecate
+            +, -, min, max, *, isless, in, copy, copyto!, axes, @deprecate
 
 
 

diff --git a/src/blockarray.jl b/src/blockarray.jl
@@ -211,6 +211,7 @@ convert(::Type{BlockArray{T1}}, A::AbstractArray{T2, N}) where {T1,T2,N} =
 convert(::Type{BlockArray}, A::AbstractArray{T, N}) where {T,N} =
     convert(BlockArray{T, N}, A)
 
+copy(A::BlockArray) = _BlockArray(copy.(A.blocks), copy(A.block_sizes))
 
 ################################
 # AbstractBlockArray Interface #

diff --git a/src/pseudo_blockarray.jl b/src/pseudo_blockarray.jl
@@ -105,7 +105,7 @@ convert(::Type{PseudoBlockArray{T1}}, A::AbstractArray{T2, N}) where {T1,T2,N} =
 convert(::Type{PseudoBlockArray}, A::AbstractArray{T, N}) where {T,N} =
     convert(PseudoBlockArray{T, N}, A)
 
-
+copy(A::PseudoBlockArray) = PseudoBlockArray(copy(A.blocks), copy(A.block_sizes))
 
 ###########################
 # AbstractArray Interface #

diff --git a/test/test_blockarrays.jl b/test/test_blockarrays.jl
@@ -330,3 +330,23 @@ end
     @test rmul!(A, 0.0) === A
     @test Array(A) == zeros(6)
 end
+
+@testset "copy" begin
+    A = PseudoBlockArray(randn(6), 1:3)
+    B = copy(A)
+    @test typeof(A) == typeof(B)
+    @test blocksizes(A) == blocksizes(B)
+    @test A == B
+    B[1] = 2
+    @test B[1] == 2
+    @test A[1] ≠ 2
+
+    A = BlockArray(randn(6), 1:3)
+    B = copy(A)
+    @test typeof(A) == typeof(B)
+    @test blocksizes(A) == blocksizes(B)
+    @test A == B
+    B[1] = 2
+    @test B[1] == 2
+    @test A[1] ≠ 2
+end