Fixup some of the linear indexing

Author: gabrielgellner

src/vector_of_array.jl

@@ -13,6 +13,8 @@ function VectorOfArray(vec::AbstractVector)
 end
 
 VectorOfArray{T, N}(vec::AbstractVector{T}, dims::NTuple{N}) = VectorOfArray{eltype(T), N, typeof(vec)}(vec, dims)
+
+Base.endof(S::VectorOfArray) = endof(S.data)
 Base.size(S::VectorOfArray) = (size(S.data[1])..., length(S.data))
 
 @inline function Base.getindex{T, N}(S::VectorOfArray{T, N}, I::Vararg{Int, N})
@@ -47,3 +49,8 @@ end
 Base.start{T, N}(S::VectorOfArray{T, N}) = 1
 Base.next{T, N}(S::VectorOfArray{T, N}, state) = (S[state], state + 1)
 Base.done{T, N}(S::VectorOfArray{T, N}, state) = state >= length(S.data) + 1
+
+# conversion tools
+function vecarr_to_arr(S::VectorOfArray)
+  return cat(length(size(S)), S.data...)
+end

test/basic_indexing.jl

@@ -1,4 +1,3 @@
-using RecursiveArrayTools
 
 # Example Problem
 recs = [[1, 2, 3], [4, 5, 6], [7, 8, 9]]
@@ -14,10 +13,10 @@ testa = cat(2, recs...)
 testva = VectorOfArray(recs)
 
 # ## Linear indexing
-testva[1] == testa[:, 1]
-testva[:] == recs
-testva[end] == testa[:, end]
-testva[2:end] == [recs[i] for i = 2:length(recs)]
+@test testva[1] == testa[:, 1]
+@test testva[:] == recs
+@test testva[end] == testa[:, end]
+@test testva[2:end] == [recs[i] for i = 2:length(recs)]
 
 # ## (Int, Int)
 @test testa[5, 4] == testva[5, 4]
@@ -61,3 +60,8 @@ testva = VectorOfArray(recs)
 @test testa[1:1, 2:3, 1:2] == testva[1:1, 2:3, 1:2]
 
 # ## Test ragged arrays work, or give errors as needed
+#TODO: I am not really sure what the behavior of this is, what does Mathematica do?
+recs = [[1, 2, 3], [3 5; 6 7], [8, 9, 10, 11]]
+testva = VectorOfArray(recs) #TODO: clearly this printed form is nonsense
+@test testva[:, 1] == recs[1]
+testva[1:2, 1:2]

test/interface_tests.jl

@@ -17,14 +17,14 @@ push!(testva2, [13, 14, 15])
 append!(testva, testva)
 @test testva[1:2, 5:6] == [1 4; 2 5]
 
-# Test that adding a array of different dimension triggers the ragged flag
+# Test that adding a array of different dimension makes the array ragged
 push!(testva, [-1, -2, -3, -4])
 #testva #TODO: this screws up printing, try to make a fallback
-#testva.ragged
-@test_throws BoundsError testva[1:2, 5:6]
+@test testva[1:2, 5:6] == [1 4; 2 5] # we just let the indexing happen if it works
+testva[4, 9] # == testva.data[9][4]
+@test testva[4:5, 5:6]
 @test testva[9] == [-1, -2, -3, -4]
-testva[end]
-testva.dims #TODO: what to do about dims when ragged?
+@test testva[end] == [-1, -2, -3, -4]
 
 # Currently we enforce the general shape, they can just be different lengths, ie we
 # can't do
@@ -37,3 +37,7 @@ recs = [rand(10, 7) for i = 1:8]
 testva = VectorOfArray(recs)
 testa = cat(3, recs...)
 @test vecarr_to_arr(testva) == testa
+
+recs = [[1, 2, 3], [3 5; 6 7], [8, 9, 10, 11]]
+testva = VectorOfArray(recs)
+vecarr_to_arr(testva)