Merge pull request JuliaArrays#1 from piever/pv/tests

append vcat tests

Author: Pietro Vertechi

README.md

@@ -7,6 +7,8 @@ This package introduces the type `StructureArray` which is an `AbstractArray` wh
 
 `Base.getproperty` or the dot syntax can be used to access columns, whereas rows can be accessed with `getindex`.
 
+The package is largely inspired from the `Columns` type in [IndexedTables](https://github.com/JuliaComputing/IndexedTables.jl)
+
 ## Example usage to store complex numbers
 
 ```julia

src/StructureArrays.jl

@@ -1,7 +1,7 @@
 module StructureArrays
 
 import Base:
-    getindex, setindex!, size, push!, view, getproperty, append!, cat
+    getindex, setindex!, size, push!, view, getproperty, append!, cat, vcat, hcat
 #     linearindexing, push!, size, sort, sort!, permute!, issorted, sortperm,
 #     summary, resize!, vcat, serialize, deserialize, append!, copy!, view
 

src/structurearray.jl

@@ -70,6 +70,15 @@ end
 function cat(dims, args::StructureArray...)
     f = key -> cat(dims, (getproperty(t, key) for t in args)...)
     T = mapreduce(eltype, promote_type, args)
-    #map(f, fields(eltype(args[1])))
     StructureArray{T}(map(f, fields(eltype(args[1]))))
 end
+
+for op in [:hcat, :vcat]
+    @eval begin
+        function $op(args::StructureArray...)
+            f = key -> $op((getproperty(t, key) for t in args)...)
+            T = mapreduce(eltype, promote_type, args)
+            StructureArray{T}(map(f, fields(eltype(args[1]))))
+        end
+    end
+end

test/runtests.jl

@@ -17,3 +17,17 @@ end
     @test t[2,1:2] == StructureArray{ComplexF64}([3, 4], [6, 7])
     @test view(t, 2, 1:2) == StructureArray{ComplexF64}(view(a, 2, 1:2), view(b, 2, 1:2))
 end
+
+@testset "concat" begin
+    t = StructureArray{Pair}([3, 5], ["a", "b"])
+    push!(t, (2 => "c"))
+    @test t == StructureArray{Pair}([3, 5, 2], ["a", "b", "c"])
+    append!(t, t)
+    @test t == StructureArray{Pair}([3, 5, 2, 3, 5, 2], ["a", "b", "c", "a", "b", "c"])
+    t = StructureArray{Pair}([3, 5], ["a", "b"])
+    t2 = StructureArray{Pair}([1, 6], ["a", "b"])
+    @test cat(1, t, t2) == StructureArray{Pair}([3, 5, 1, 6], ["a", "b", "a", "b"]) == vcat(t, t2)
+    @test vcat(t, t2) isa StructureArray
+    @test cat(2, t, t2) == StructureArray{Pair}([3 1; 5 6], ["a" "a"; "b" "b"]) == hcat(t, t2)
+    @test hcat(t, t2) isa StructureArray
+end