|
162 | 162 | end |
163 | 163 | end |
164 | 164 | end |
| 165 | + |
| 166 | +# Test that concatenations of annotated sparse/special matrix types with other matrix |
| 167 | +# types yield sparse arrays, and that the code which effects that does not make concatenations |
| 168 | +# strictly involving un/annotated dense matrices yield sparse arrays |
| 169 | +# |
| 170 | +# TODO: As with the associated code, these tests should be moved to a more appropriate |
| 171 | +# location, particularly some future equivalent of base/linalg/special.jl dedicated to |
| 172 | +# intereactions between a broader set of matrix types |
| 173 | +let |
| 174 | + N = 4 |
| 175 | + # The tested annotation types |
| 176 | + testfull = Bool(parse(Int,(get(ENV, "JULIA_TESTFULL", "0")))) |
| 177 | + utriannotations = (UpperTriangular, Base.LinAlg.UnitUpperTriangular) |
| 178 | + ltriannotations = (LowerTriangular, Base.LinAlg.UnitLowerTriangular) |
| 179 | + triannotations = (utriannotations..., ltriannotations...) |
| 180 | + symannotations = (Symmetric, Hermitian) |
| 181 | + annotations = testfull ? (triannotations..., symannotations...) : (LowerTriangular, Symmetric) |
| 182 | + # Concatenations involving these types, un/annotated, should yield sparse arrays |
| 183 | + spvec = spzeros(N) |
| 184 | + spmat = speye(N) |
| 185 | + diagmat = Diagonal(ones(N)) |
| 186 | + bidiagmat = Bidiagonal(ones(N), ones(N-1), true) |
| 187 | + tridiagmat = Tridiagonal(ones(N-1), ones(N), ones(N-1)) |
| 188 | + symtridiagmat = SymTridiagonal(ones(N), ones(N-1)) |
| 189 | + sparseconcatmats = testfull ? (spmat, diagmat, bidiagmat, tridiagmat, symtridiagmat) : (spmat, diagmat) |
| 190 | + # Concatenations involving strictly these types, un/annotated, should yield dense arrays |
| 191 | + densevec = ones(N) |
| 192 | + densemat = ones(N, N) |
| 193 | + # Annotated collections |
| 194 | + annodmats = [annot(densemat) for annot in annotations] |
| 195 | + annospcmats = [annot(spcmat) for annot in annotations, spcmat in sparseconcatmats] |
| 196 | + # Test that concatenations of pairwise combinations of annotated sparse/special |
| 197 | + # yield sparse matrices |
| 198 | + for annospcmata in annospcmats, annospcmatb in annospcmats |
| 199 | + @test issparse(vcat(annospcmata, annospcmatb)) |
| 200 | + @test issparse(hcat(annospcmata, annospcmatb)) |
| 201 | + @test issparse(hvcat((2,), annospcmata, annospcmatb)) |
| 202 | + @test issparse(cat((1,2), annospcmata, annospcmatb)) |
| 203 | + end |
| 204 | + # Test that concatenations of pairwise combinations of annotated sparse/special |
| 205 | + # matrices and other matrix/vector types yield sparse matrices |
| 206 | + for annospcmat in annospcmats |
| 207 | + # --> Tests applicable to pairs including only matrices |
| 208 | + for othermat in (densemat, annodmats..., sparseconcatmats...) |
| 209 | + @test issparse(vcat(annospcmat, othermat)) |
| 210 | + @test issparse(vcat(othermat, annospcmat)) |
| 211 | + end |
| 212 | + # --> Tests applicable to pairs including other vectors or matrices |
| 213 | + for other in (spvec, densevec, densemat, annodmats..., sparseconcatmats...) |
| 214 | + @test issparse(hcat(annospcmat, other)) |
| 215 | + @test issparse(hcat(other, annospcmat)) |
| 216 | + @test issparse(hvcat((2,), annospcmat, other)) |
| 217 | + @test issparse(hvcat((2,), other, annospcmat)) |
| 218 | + @test issparse(cat((1,2), annospcmat, other)) |
| 219 | + @test issparse(cat((1,2), other, annospcmat)) |
| 220 | + end |
| 221 | + end |
| 222 | + # The preceding tests should cover multi-way combinations of those types, but for good |
| 223 | + # measure test a few multi-way combinations involving those types |
| 224 | + @test issparse(vcat(spmat, densemat, annospcmats[1], annodmats[2])) |
| 225 | + @test issparse(vcat(densemat, spmat, annodmats[1], annospcmats[2])) |
| 226 | + @test issparse(hcat(spvec, annodmats[1], annospcmats[3], densevec, diagmat)) |
| 227 | + @test issparse(hcat(annodmats[2], annospcmats[4], spvec, densevec, diagmat)) |
| 228 | + @test issparse(hvcat((5,), diagmat, densevec, spvec, annodmats[1], annospcmats[1])) |
| 229 | + @test issparse(hvcat((5,), spvec, annodmats[2], diagmat, densevec, annospcmats[2])) |
| 230 | + @test issparse(cat((1,2), annodmats[1], diagmat, annospcmats[3], densevec, spvec)) |
| 231 | + @test issparse(cat((1,2), spvec, diagmat, densevec, annospcmats[4], annodmats[2])) |
| 232 | + # Test that concatenations strictly involving un/annotated dense matrices/vectors |
| 233 | + # yield dense arrays |
| 234 | + for densemata in (densemat, annodmats...) |
| 235 | + # --> Tests applicable to pairs including only matrices |
| 236 | + for densematb in (densemat, annodmats...) |
| 237 | + @test !issparse(vcat(densemata, densematb)) |
| 238 | + @test !issparse(vcat(densematb, densemata)) |
| 239 | + end |
| 240 | + # --> Tests applicable to pairs including vectors or matrices |
| 241 | + for otherdense in (densevec, densemat, annodmats...) |
| 242 | + @test !issparse(hcat(densemata, otherdense)) |
| 243 | + @test !issparse(hcat(otherdense, densemata)) |
| 244 | + @test !issparse(hvcat((2,), densemata, otherdense)) |
| 245 | + @test !issparse(hvcat((2,), otherdense, densemata)) |
| 246 | + @test !issparse(cat((1,2), densemata, otherdense)) |
| 247 | + @test !issparse(cat((1,2), otherdense, densemata)) |
| 248 | + end |
| 249 | + end |
| 250 | +end |
0 commit comments