Skip to content

Commit b274ab5

Browse files
authored
remove all oop tests
1 parent ce1e176 commit b274ab5

File tree

1 file changed

+0
-55
lines changed

1 file changed

+0
-55
lines changed

test/build_function_arrayofarray.jl

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ input = [1, 2, 3]
1111
# ===== Dense tests =====
1212
# Arrays of Matrices
1313
h_dense_arraymat = [[a 1; b 0], [0 0; 0 0], [a c; 1 0]] # empty array support required
14-
function h_dense_arraymat_julia(x)
15-
a, b, c = x
16-
return [[a[1] 1; b[1] 0], [0 0; 0 0], [a[1] c[1]; 1 0]]
17-
end
1814
function h_dense_arraymat_julia!(out, x)
1915
a, b, c = x
2016
out[1] .= [a[1] 1; b[1] 0]
@@ -23,23 +19,15 @@ function h_dense_arraymat_julia!(out, x)
2319
end
2420

2521
h_dense_arraymat_str = ModelingToolkit.build_function(h_dense_arraymat, [a, b, c])
26-
h_dense_arraymat_oop = eval(h_dense_arraymat_str[1])
2722
h_dense_arraymat_ip! = eval(h_dense_arraymat_str[2])
2823
out_1_arraymat = [Array{Int64}(undef, 2, 2) for i in 1:3]
2924
out_2_arraymat = [similar(x) for x in out_1_arraymat]
30-
julia_dense_arraymat = h_dense_arraymat_julia(input)
31-
mtk_dense_arraymat = h_dense_arraymat_oop(input)
32-
@test_broken julia_dense_arraymat == mtk_dense_arraymat
3325
h_dense_arraymat_julia!(out_1_arraymat, input)
3426
h_dense_arraymat_ip!(out_2_arraymat, input)
3527
@test out_1_arraymat == out_2_arraymat
3628

3729
# Arrays of 1D Vectors
3830
h_dense_arrayvec = [[a, 0, c], [0, 0, 0], [1, a, b]] # same for empty vectors, etc.
39-
function h_dense_arrayvec_julia(x)
40-
a, b, c = x
41-
return [[a[1], 0, c[1]], [0, 0, 0], [1, a[1], b[1]]]
42-
end
4331
function h_dense_arrayvec_julia!(out, x)
4432
a, b, c = x
4533
out[1] .= [a[1], 0, c[1]]
@@ -48,24 +36,15 @@ function h_dense_arrayvec_julia!(out, x)
4836
end
4937

5038
h_dense_arrayvec_str = ModelingToolkit.build_function(h_dense_arrayvec, [a, b, c])
51-
h_dense_arrayvec_oop = eval(h_dense_arrayvec_str[1])
5239
h_dense_arrayvec_ip! = eval(h_dense_arrayvec_str[2])
5340
out_1_arrayvec = [Vector{Int64}(undef, 3) for i in 1:3]
5441
out_2_arrayvec = [Vector{Int64}(undef, 3) for i in 1:3]
55-
julia_dense_arrayvec = h_dense_arrayvec_julia(input)
56-
mtk_dense_arrayvec = h_dense_arrayvec_oop(input)
57-
@test_broken julia_dense_arrayvec == mtk_dense_arrayvec
58-
mtk_dense_arrayvec = @test_broken h_dense_arrayvec_oop(input)
5942
h_dense_arrayvec_julia!(out_1_arrayvec, input)
6043
h_dense_arrayvec_ip!(out_2_arrayvec, input)
6144
@test out_1_arrayvec == out_2_arrayvec
6245

6346
# Arrays of Arrays of Matrices
6447
h_dense_arrayNestedMat = [[[a 1; b 0], [0 0; 0 0]], [[b 1; a 0], [b c; 0 1]]]
65-
function h_dense_arrayNestedMat_julia(x)
66-
a, b, c = x
67-
return [[[a[1] 1; b[1] 0], [0 0; 0 0]], [[b[1] 1; a[1] 0], [b[1] c[1]; 0 1]]]
68-
end
6948
function h_dense_arrayNestedMat_julia!(out, x)
7049
a, b, c = x
7150
out[1][1] .= [a[1] 1; b[1] 0]
@@ -75,24 +54,16 @@ function h_dense_arrayNestedMat_julia!(out, x)
7554
end
7655

7756
h_dense_arrayNestedMat_str = ModelingToolkit.build_function(h_dense_arrayNestedMat, [a, b, c])
78-
h_dense_arrayNestedMat_oop = eval(h_dense_arrayNestedMat_str[1])
7957
h_dense_arrayNestedMat_ip! = eval(h_dense_arrayNestedMat_str[2])
8058
out_1_arrayNestedMat = [[rand(Int64, 2, 2), rand(Int64, 2, 2)], [rand(Int64, 2, 2), rand(Int64, 2, 2)]] # avoid undef broadcasting issue
8159
out_2_arrayNestedMat = [[rand(Int64, 2, 2), rand(Int64, 2, 2)], [rand(Int64, 2, 2), rand(Int64, 2, 2)]]
82-
julia_dense_arrayNestedMat = h_dense_arrayNestedMat_julia(input)
83-
mtk_dense_arrayNestedMat = h_dense_arrayNestedMat_oop(input)
84-
@test_broken julia_dense_arrayNestedMat == mtk_dense_arrayNestedMat
8560
h_dense_arrayNestedMat_julia!(out_1_arrayNestedMat, input)
8661
h_dense_arrayNestedMat_ip!(out_2_arrayNestedMat, input)
8762
@test out_1_arrayNestedMat == out_2_arrayNestedMat
8863

8964
# ===== Sparse tests =====
9065
# Array of Matrices
9166
h_sparse_arraymat = sparse.([[a 1; b 0], [0 0; 0 0], [a c; 1 0]])
92-
function h_sparse_arraymat_julia(x)
93-
a, b, c = x
94-
return [sparse([a[1] 1; b[1] 0]), sparse([0 0; 0 0]), sparse([a[1] c[1]; 1 0])] # necessary because sparse([]) is a SparseVector, not SparseMatrix
95-
end
9667
function h_sparse_arraymat_julia!(out, x)
9768
a, b, c = x
9869
out[1][1, 1] = a[1]
@@ -105,24 +76,16 @@ function h_sparse_arraymat_julia!(out, x)
10576
end
10677

10778
h_sparse_arraymat_str = ModelingToolkit.build_function(h_sparse_arraymat, [a, b, c])
108-
h_sparse_arraymat_oop = eval(h_sparse_arraymat_str[1])
10979
h_sparse_arraymat_ip! = eval(h_sparse_arraymat_str[2])
11080
h_sparse_arraymat_sparsity_patterns = map(get_sparsity_pattern, h_sparse_arraymat)
11181
out_1_arraymat = [similar(h) for h in h_sparse_arraymat_sparsity_patterns]
11282
out_2_arraymat = [similar(h) for h in h_sparse_arraymat_sparsity_patterns] # can't do similar() because it will just be #undef, with the wrong sparsity pattern
113-
julia_sparse_arraymat = h_sparse_arraymat_julia(input)
114-
mtk_sparse_arraymat = h_sparse_arraymat_oop(input)
115-
@test_broken julia_sparse_arraymat == mtk_sparse_arraymat
11683
h_sparse_arraymat_julia!(out_1_arraymat, input)
11784
h_sparse_arraymat_ip!(out_2_arraymat, input)
11885
@test out_1_arraymat == out_2_arraymat
11986

12087
# Array of 1D Vectors
12188
h_sparse_arrayvec = sparse.([[a, 0, c], [0, 0, 0], [1, a, b]])
122-
function h_sparse_arrayvec_julia(x)
123-
a, b, c = x
124-
return sparse.([[a[1], 0, c[1]], [0, 0, 0], [1, a[1], b[1]]])
125-
end
12689
function h_sparse_arrayvec_julia!(out, x)
12790
a, b, c = x
12891
out[1][1] = a[1]
@@ -134,24 +97,16 @@ function h_sparse_arrayvec_julia!(out, x)
13497
end
13598

13699
h_sparse_arrayvec_str = ModelingToolkit.build_function(h_sparse_arrayvec, [a, b, c])
137-
h_sparse_arrayvec_oop = eval(h_sparse_arrayvec_str[1])
138100
h_sparse_arrayvec_ip! = eval(h_sparse_arrayvec_str[2])
139101
h_sparse_arrayvec_sparsity_patterns = map(get_sparsity_pattern, h_sparse_arrayvec)
140102
out_1_arrayvec = [similar(h) for h in h_sparse_arrayvec_sparsity_patterns]
141103
out_2_arrayvec = [similar(h) for h in h_sparse_arrayvec_sparsity_patterns]
142-
julia_sparse_arrayvec = h_sparse_arrayvec_julia(input)
143-
mtk_sparse_arrayvec = h_sparse_arrayvec_oop(input)
144-
@test_broken julia_sparse_arrayvec == mtk_sparse_arrayvec
145104
h_sparse_arrayvec_julia!(out_1_arrayvec, input)
146105
h_sparse_arrayvec_ip!(out_2_arrayvec, input)
147106
@test out_1_arrayvec == out_2_arrayvec
148107

149108
# Arrays of Arrays of Matrices
150109
h_sparse_arrayNestedMat = [sparse.([[a 1; b 0], [0 0; 0 0]]), sparse.([[b 1; a 0], [b c; 0 1]])]
151-
function h_sparse_arrayNestedMat_julia(x)
152-
a, b, c = x
153-
return [sparse.([[a[1] 1; b[1] 0], [0 0; 0 0]]), sparse.([[b[1] 1; a[1] 0], [b[1] c[1]; 0 1]])]
154-
end
155110
function h_sparse_arrayNestedMat_julia!(out, x)
156111
a, b, c = x
157112
out[1][1][1, 1] = a[1]
@@ -167,14 +122,10 @@ function h_sparse_arrayNestedMat_julia!(out, x)
167122
end
168123

169124
h_sparse_arrayNestedMat_str = ModelingToolkit.build_function(h_sparse_arrayNestedMat, [a, b, c])
170-
h_sparse_arrayNestedMat_oop = eval(h_sparse_arrayNestedMat_str[1])
171125
h_sparse_arrayNestedMat_ip! = eval(h_sparse_arrayNestedMat_str[2])
172126
h_sparse_arrayNestedMat_sparsity_patterns = [map(get_sparsity_pattern, h) for h in h_sparse_arrayNestedMat]
173127
out_1_arrayNestedMat = [[similar(h_sub) for h_sub in h] for h in h_sparse_arrayNestedMat_sparsity_patterns]
174128
out_2_arrayNestedMat = [[similar(h_sub) for h_sub in h] for h in h_sparse_arrayNestedMat_sparsity_patterns]
175-
julia_sparse_arrayNestedMat = h_sparse_arrayNestedMat_julia(input)
176-
mtk_sparse_arrayNestedMat = h_sparse_arrayNestedMat_oop(input)
177-
@test_broken julia_sparse_arrayNestedMat == mtk_sparse_arrayNestedMat
178129
h_sparse_arrayNestedMat_julia!(out_1_arrayNestedMat, input)
179130
h_sparse_arrayNestedMat_ip!(out_2_arrayNestedMat, input)
180131
@test out_1_arrayNestedMat == out_2_arrayNestedMat
@@ -184,26 +135,20 @@ h_sparse_arrayNestedMat_ip!(out_2_arrayNestedMat, input)
184135
# Arrays of Matrices
185136
h_empty = [[a b; c 0], Array{Expression,2}(undef, 0,0)]
186137
h_empty_str = ModelingToolkit.build_function(h_empty, [a, b, c])
187-
h_empty_oop = eval(h_empty_str[1])
188138
h_empty_ip! = eval(h_empty_str[2])
189-
@test_broken h_empty_oop(input) == [[1 2; 3 0], Array{Int64,2}(undef,0,0)]
190139
out = [Matrix{Int64}(undef, 2, 2), Matrix{Int64}(undef, 0, 0)]
191140
h_empty_ip!(out, input) # should just not fail
192141

193142
# Array of Vectors
194143
h_empty_vec = [[a, b, c, 0], Vector{Expression}(undef,0)]
195144
h_empty_vec_str = ModelingToolkit.build_function(h_empty_vec, [a, b, c])
196-
h_empty_vec_oop = eval(h_empty_vec_str[1])
197145
h_empty_vec_ip! = eval(h_empty_vec_str[2])
198-
@test_broken h_empty_vec_oop(input) == [[1, 2, 3, 0], Vector{Int64}(undef,0)]
199146
out = [Vector{Int64}(undef, 4), Vector{Int64}(undef, 0)]
200147
h_empty_vec_ip!(out, input) # should just not fail
201148

202149
# Arrays of Arrays of Matrices
203150
h_emptyNested = [[[a b; c 0]], Array{Array{Expression, 2}}(undef, 0)] # emptyNested array of arrays
204151
h_emptyNested_str = ModelingToolkit.build_function(h_emptyNested, [a, b, c])
205-
h_emptyNested_oop = eval(h_emptyNested_str[1])
206152
h_emptyNested_ip! = eval(h_emptyNested_str[2])
207-
@test_broken h_emptyNested_oop(input) == [[[1 2; 3 0]], Array{Array{Int64, 2}}(undef, 0)]
208153
out = [[[1 2;3 4]], Array{Array{Int64,2},1}(undef, 0)]
209154
h_emptyNested_ip!(out, input) # should just not fail

0 commit comments

Comments
 (0)