Skip to content

Commit 957641e

Browse files
committed
add more tests
1 parent 12c7a0c commit 957641e

1 file changed

Lines changed: 27 additions & 8 deletions

File tree

test/basic_indexing.jl

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,6 @@ diffeq = DiffEqArray(recs, t)
145145
@test diffeq[:, 1] == recs[1]
146146
@test diffeq[1:2, 1:2] == [1 3; 2 5]
147147

148-
ragged = VectorOfArray([[1.0, 2.0], [3.0, 4.0, 5.0], [6.0, 7.0, 8.0, 9.0]])
149-
@test ragged[end, 1] == 2.0
150-
@test ragged[end, 2] == 5.0
151-
@test ragged[end, 3] == 9.0
152-
@test ragged[end - 1, 3] == 8.0
153-
@test ragged[1:end, 1] == [1.0, 2.0]
154-
@test ragged[1:end, 2] == [3.0, 4.0, 5.0]
155-
156148
# Test views of heterogeneous arrays (issue #453)
157149
f = VectorOfArray([[1.0], [2.0, 3.0]])
158150
@test length(view(f, :, 1)) == 1
@@ -170,6 +162,33 @@ f2 = VectorOfArray([[1.0, 2.0], [3.0]])
170162
@test collect(view(f2, :, 1)) == f2[:, 1]
171163
@test collect(view(f2, :, 2)) == f2[:, 2]
172164

165+
# Test `end` with ragged arrays
166+
ragged = VectorOfArray([[1.0, 2.0], [3.0, 4.0, 5.0], [6.0, 7.0, 8.0, 9.0]])
167+
@test ragged[end, 1] == 2.0
168+
@test ragged[end, 2] == 5.0
169+
@test ragged[end, 3] == 9.0
170+
@test ragged[end - 1, 1] == 1.0
171+
@test ragged[end - 1, 2] == 4.0
172+
@test ragged[end - 1, 3] == 8.0
173+
@test ragged[1:end, 1] == [1.0, 2.0]
174+
@test ragged[1:end, 2] == [3.0, 4.0, 5.0]
175+
@test ragged[1:end, 3] == [6.0, 7.0, 8.0, 9.0]
176+
177+
ragged2 = VectorOfArray([[1.0, 2.0, 3.0, 4.0], [5.0, 6.0], [7.0, 8.0, 9.0]])
178+
@test ragged2[end, 1] == 4.0
179+
@test ragged2[end, 2] == 6.0
180+
@test ragged2[end, 3] == 9.0
181+
@test ragged2[end - 1, 1] == 3.0
182+
@test ragged2[end - 1, 2] == 5.0
183+
@test ragged2[end - 1, 3] == 8.0
184+
@test ragged2[end - 2, 1] == 2.0
185+
@test ragged2[1:end, 1] == [1.0, 2.0, 3.0, 4.0]
186+
@test ragged2[1:end, 2] == [5.0, 6.0]
187+
@test ragged2[1:end, 3] == [7.0, 8.0, 9.0]
188+
@test ragged2[2:end, 1] == [2.0, 3.0, 4.0]
189+
@test ragged2[2:end, 2] == [6.0]
190+
@test ragged2[2:end, 3] == [8.0, 9.0]
191+
173192
# Test that views can be modified
174193
f3 = VectorOfArray([[1.0, 2.0], [3.0, 4.0, 5.0]])
175194
v = view(f3, :, 2)

0 commit comments

Comments
 (0)