annotate yetilab/matrix/test/test_matrix.yeti @ 243:1313764cb89c sparse

Separate out thresholding from toSparse. Not entirely sure this is a good thing
author Chris Cannam
date Mon, 20 May 2013 16:45:34 +0100
parents 0ac8672d12b2
children ce4de16ea65d
rev   line source
Chris@97 1
Chris@97 2 module yetilab.matrix.test.test_matrix;
Chris@97 3
Chris@97 4 mat = load yetilab.matrix.matrix;
Chris@222 5 vec = load yetilab.vector.vector;
Chris@97 6
Chris@222 7 load yetilab.vector.vectortype;
Chris@220 8 load yetilab.matrix.matrixtype;
Chris@220 9
Chris@98 10 import yeti.lang: FailureException;
Chris@98 11
Chris@158 12 { compare, compareUsing } = load yetilab.test.test;
Chris@97 13
Chris@158 14 compareMatrices = compareUsing mat.equal;
Chris@99 15
Chris@99 16 makeTests name flipper =
Chris@99 17 (constMatrix n s = flipper (mat.constMatrix n s);
Chris@99 18 zeroMatrix s = flipper (mat.zeroMatrix s);
Chris@99 19 randomMatrix s = flipper (mat.randomMatrix s);
Chris@99 20 identityMatrix s = flipper (mat.identityMatrix s);
Chris@99 21 generate f s = flipper (mat.generate f s);
Chris@218 22 newMatrix t d = flipper (mat.newMatrix t (map vec.fromList d));
Chris@97 23 [
Chris@97 24
Chris@99 25 "constMatrixEmpty-\(name)": \(
Chris@99 26 m = constMatrix 2 { rows = 0, columns = 0 };
Chris@210 27 compare (mat.size m) { columns = 0, rows = 0 }
Chris@97 28 ),
Chris@97 29
Chris@99 30 "constMatrixEmpty2-\(name)": \(
Chris@210 31 compare (mat.size (constMatrix 2 { rows = 0, columns = 4 })) { columns = 0, rows = 0 } and
Chris@210 32 compare (mat.size (constMatrix 2 { rows = 4, columns = 0 })) { columns = 0, rows = 0 }
Chris@97 33 ),
Chris@97 34
Chris@99 35 "constMatrix-\(name)": \(
Chris@99 36 m = constMatrix 2 { rows = 3, columns = 4 };
Chris@210 37 compare (mat.size m) { columns = 4, rows = 3 } and
Chris@218 38 all id (map do row: compare (vec.list (mat.getRow row m)) [2,2,2,2] done [0..2]) and
Chris@218 39 all id (map do col: compare (vec.list (mat.getColumn col m)) [2,2,2] done [0..3])
Chris@97 40 ),
Chris@97 41
Chris@99 42 "randomMatrixEmpty-\(name)": \(
Chris@99 43 m = randomMatrix { rows = 0, columns = 0 };
Chris@210 44 compare (mat.size m) { columns = 0, rows = 0 }
Chris@97 45 ),
Chris@97 46
Chris@99 47 "randomMatrix-\(name)": \(
Chris@99 48 m = randomMatrix { rows = 3, columns = 4 };
Chris@210 49 compare (mat.size m) { columns = 4, rows = 3 }
Chris@97 50 ),
Chris@97 51
Chris@99 52 "zeroMatrixEmpty-\(name)": \(
Chris@99 53 m = zeroMatrix { rows = 0, columns = 0 };
Chris@210 54 compare (mat.size m) { columns = 0, rows = 0 }
Chris@97 55 ),
Chris@97 56
Chris@99 57 "zeroMatrix-\(name)": \(
Chris@99 58 m = zeroMatrix { rows = 3, columns = 4 };
Chris@210 59 compare (mat.size m) { columns = 4, rows = 3 } and
Chris@218 60 all id (map do row: compare (vec.list (mat.getRow row m)) [0,0,0,0] done [0..2]) and
Chris@218 61 all id (map do col: compare (vec.list (mat.getColumn col m)) [0,0,0] done [0..3])
Chris@97 62 ),
Chris@97 63
Chris@99 64 "identityMatrixEmpty-\(name)": \(
Chris@99 65 m = identityMatrix { rows = 0, columns = 0 };
Chris@210 66 compare (mat.size m) { columns = 0, rows = 0 }
Chris@97 67 ),
Chris@97 68
Chris@99 69 "identityMatrix-\(name)": \(
Chris@99 70 m = identityMatrix { rows = 3, columns = 4 };
Chris@210 71 compare (mat.size m) { columns = 4, rows = 3 } and
Chris@218 72 all id (map do row: compare (vec.list (mat.getRow row m)) [1,1,1,1] done [0..2]) and
Chris@218 73 all id (map do col: compare (vec.list (mat.getColumn col m)) [1,1,1] done [0..3])
Chris@97 74 ),
Chris@97 75
Chris@99 76 "generateEmpty-\(name)": \(
Chris@99 77 m = generate do row col: 0 done { rows = 0, columns = 0 };
Chris@210 78 compare (mat.size m) { columns = 0, rows = 0 }
Chris@97 79 ),
Chris@97 80
Chris@99 81 "generate-\(name)": \(
Chris@99 82 m = generate do row col: row * 10 + col done { rows = 2, columns = 3 };
Chris@218 83 compare (vec.list (mat.getRow 0 m)) [0,1,2] and
Chris@218 84 compare (vec.list (mat.getRow 1 m)) [10,11,12]
Chris@97 85 ),
Chris@97 86
Chris@99 87 "widthAndHeight-\(name)": \(
Chris@99 88 m = constMatrix 2 { rows = 3, columns = 4 };
Chris@210 89 compare (mat.size m) { columns = mat.width m, rows = mat.height m }
Chris@97 90 ),
Chris@97 91
Chris@99 92 "equal-\(name)": \(
Chris@241 93 m = newMatrix (ColumnMajor ()) [[1,4],[0,5],[3,6]];
Chris@100 94 n = m;
Chris@241 95 p = newMatrix (RowMajor ()) [[1,0,3],[4,5,6]];
Chris@241 96 q = newMatrix (ColumnMajor ()) [[1,0,3],[4,5,6]];
Chris@241 97 r = newMatrix (ColumnMajor ()) [[1,4],[0,5]];
Chris@100 98 compareMatrices m n and
Chris@100 99 compareMatrices m p and
Chris@100 100 compareMatrices n p and
Chris@159 101 not mat.equal m q and
Chris@159 102 not mat.equal m r
Chris@97 103 ),
Chris@97 104
Chris@229 105 "equalUnder-\(name)": \(
Chris@229 106 p = newMatrix (ColumnMajor ()) [[1,2,3],[4,5,6]];
Chris@229 107 q = newMatrix (ColumnMajor ()) [[1,2,3],[4,5,6]];
Chris@229 108 r = newMatrix (ColumnMajor ()) [[4,3,1],[3,1,2]];
Chris@241 109 s = newMatrix (ColumnMajor ()) [[1,4,5],[6,7,8]];
Chris@241 110 t = newMatrix (ColumnMajor ()) [[1,4,5],[6,7,9]];
Chris@229 111 mat.equalUnder (==) p p and
Chris@229 112 mat.equalUnder (==) p q and
Chris@229 113 mat.equalUnder (!=) p r and
Chris@229 114 mat.equalUnder do a b: a % 2 == b % 2 done p s and
Chris@229 115 not mat.equalUnder do a b: a % 2 == b % 2 done p t
Chris@229 116 ),
Chris@229 117
Chris@99 118 "getAt-\(name)": \(
Chris@97 119 generator row col = row * 10 + col;
Chris@99 120 m = generate generator { rows = 2, columns = 3 };
Chris@97 121 all id
Chris@97 122 (map do row: all id
Chris@210 123 (map do col: mat.getAt row col m == generator row col done [0..2])
Chris@97 124 done [0..1])
Chris@97 125 ),
Chris@97 126
Chris@99 127 "transposedEmpty-\(name)": \(
Chris@210 128 compare (mat.size (mat.transposed (constMatrix 2 { rows = 0, columns = 0 }))) { columns = 0, rows = 0 } and
Chris@210 129 compare (mat.size (mat.transposed (constMatrix 2 { rows = 0, columns = 4 }))) { columns = 0, rows = 0 } and
Chris@210 130 compare (mat.size (mat.transposed (constMatrix 2 { rows = 4, columns = 0 }))) { columns = 0, rows = 0 }
Chris@97 131 ),
Chris@97 132
Chris@99 133 "transposedSize-\(name)": \(
Chris@210 134 compare (mat.size (mat.transposed (constMatrix 2 { rows = 3, columns = 4 }))) { columns = 3, rows = 4 }
Chris@97 135 ),
Chris@97 136
Chris@99 137 "transposed-\(name)": \(
Chris@97 138 generator row col = row * 10 + col;
Chris@99 139 m = generate generator { rows = 2, columns = 3 };
Chris@97 140 m' = mat.transposed m;
Chris@97 141 all id
Chris@97 142 (map do row: all id
Chris@97 143 // like getAt test, but with col/row flipped
Chris@210 144 (map do col: mat.getAt col row m' == generator row col done [0..2])
Chris@97 145 done [0..1])
Chris@97 146 ),
Chris@97 147
Chris@100 148 "transposed-back-\(name)": \(
Chris@100 149 m = newMatrix (ColumnMajor ()) [[1,4],[2,5],[3,6]];
Chris@100 150 compareMatrices m (mat.transposed (mat.transposed m)) and
Chris@100 151 not mat.equal m (mat.transposed m);
Chris@100 152 ),
Chris@100 153
Chris@100 154 "flipped-\(name)": \(
Chris@241 155 m = newMatrix (ColumnMajor ()) [[1,4],[0,5],[3,6]];
Chris@99 156 m' = mat.flipped m;
Chris@241 157 m'' = newMatrix (RowMajor ()) [[1,0,3],[4,5,6]];
Chris@100 158 compareMatrices m m' and compareMatrices m m'' and compareMatrices m' m'';
Chris@98 159 ),
Chris@98 160
Chris@100 161 "flipped-back-\(name)": \(
Chris@241 162 m = newMatrix (ColumnMajor ()) [[1,4],[0,5],[3,6]];
Chris@100 163 compareMatrices m (mat.flipped (mat.flipped m));
Chris@100 164 ),
Chris@100 165
Chris@100 166 "flipped-empty-\(name)": \(
Chris@99 167 m = constMatrix 2 { rows = 0, columns = 4 };
Chris@99 168 compareMatrices (mat.flipped m) (mat.flipped (constMatrix 0 { rows = 0, columns = 0 }));
Chris@98 169 ),
Chris@98 170
Chris@161 171 "toRowMajor-\(name)": \(
Chris@241 172 m = newMatrix (ColumnMajor ()) [[1,4],[0,5],[3,6]];
Chris@161 173 m' = mat.toRowMajor m;
Chris@241 174 m'' = newMatrix (RowMajor ()) [[1,0,3],[4,5,6]];
Chris@161 175 m''' = mat.toRowMajor m'';
Chris@161 176 compareMatrices m m' and compareMatrices m m'' and compareMatrices m' m''
Chris@161 177 and compareMatrices m m''';
Chris@161 178 ),
Chris@161 179
Chris@161 180 "toColumnMajor-\(name)": \(
Chris@241 181 m = newMatrix (RowMajor ()) [[1,4],[0,5],[3,6]];
Chris@161 182 m' = mat.toColumnMajor m;
Chris@241 183 m'' = newMatrix (ColumnMajor ()) [[1,0,3],[4,5,6]];
Chris@161 184 m''' = mat.toColumnMajor m'';
Chris@161 185 compareMatrices m m' and compareMatrices m m'' and compareMatrices m' m''
Chris@161 186 and compareMatrices m m''';
Chris@161 187 ),
Chris@161 188
Chris@99 189 "scaled-\(name)": \(
Chris@99 190 compareMatrices
Chris@99 191 (mat.scaled 0.5 (constMatrix 2 { rows = 3, columns = 4 }))
Chris@99 192 (constMatrix 1 { rows = 3, columns = 4 }) and
Chris@99 193 compareMatrices
Chris@99 194 (mat.scaled 0.5 (constMatrix (-3) { rows = 3, columns = 4 }))
Chris@99 195 (constMatrix (-1.5) { rows = 3, columns = 4 }) and
Chris@99 196 compareMatrices
Chris@99 197 (mat.scaled 0.5 (constMatrix 2 { rows = 0, columns = 2 }))
Chris@99 198 (constMatrix 5 { rows = 0, columns = 0 })
Chris@99 199 ),
Chris@99 200
Chris@99 201 "sum-\(name)": \(
Chris@99 202 compareMatrices
Chris@99 203 (mat.sum (constMatrix 2 { rows = 3, columns = 4 })
Chris@99 204 (constMatrix 1 { rows = 3, columns = 4 }))
Chris@99 205 (constMatrix 3 { rows = 3, columns = 4 })
Chris@99 206 ),
Chris@99 207
Chris@99 208 "sumFail-\(name)": \(
Chris@98 209 try
Chris@99 210 \() (mat.sum (constMatrix 2 { rows = 3, columns = 4 })
Chris@99 211 (constMatrix 1 { rows = 3, columns = 5 }));
Chris@98 212 false;
Chris@98 213 catch FailureException e:
Chris@98 214 true
Chris@98 215 yrt
Chris@98 216 ),
Chris@98 217
Chris@229 218 "difference-\(name)": \(
Chris@229 219 compareMatrices
Chris@229 220 (mat.difference (constMatrix 2 { rows = 3, columns = 4 })
Chris@229 221 (constMatrix 1 { rows = 3, columns = 4 }))
Chris@229 222 (constMatrix 1 { rows = 3, columns = 4 })
Chris@229 223 ),
Chris@229 224
Chris@229 225 "differenceFail-\(name)": \(
Chris@229 226 try
Chris@229 227 \() (mat.difference (constMatrix 2 { rows = 3, columns = 4 })
Chris@229 228 (constMatrix 1 { rows = 3, columns = 5 }));
Chris@229 229 false;
Chris@229 230 catch FailureException e:
Chris@229 231 true
Chris@229 232 yrt
Chris@229 233 ),
Chris@229 234
Chris@229 235 "abs-\(name)": \(
Chris@229 236 compareMatrices
Chris@229 237 (mat.abs (newMatrix (ColumnMajor ()) [[-1,4],[2,-5],[-3,0]]))
Chris@229 238 (newMatrix (ColumnMajor ()) [[1,4],[2,5],[3,0]])
Chris@229 239 ),
Chris@229 240
Chris@99 241 "product-\(name)": \(
Chris@99 242 compareMatrices
Chris@99 243 (mat.product (constMatrix 2 { rows = 4, columns = 2 })
Chris@99 244 (constMatrix 3 { rows = 2, columns = 3 }))
Chris@99 245 (constMatrix 12 { rows = 4, columns = 3 }) and
Chris@99 246 compareMatrices
Chris@99 247 (mat.product (newMatrix (ColumnMajor ()) [[1,4],[2,5],[3,6]])
Chris@99 248 (newMatrix (ColumnMajor ()) [[7,9,11],[8,10,12]]))
Chris@99 249 (newMatrix (ColumnMajor ()) [[58,139],[64,154]])
Chris@98 250 ),
Chris@98 251
Chris@99 252 "productFail-\(name)": \(
Chris@99 253 try
Chris@99 254 \() (mat.product (constMatrix 2 { rows = 4, columns = 2 })
Chris@99 255 (constMatrix 3 { rows = 3, columns = 2 }));
Chris@99 256 false;
Chris@99 257 catch FailureException e:
Chris@99 258 true
Chris@99 259 yrt
Chris@99 260 ),
Chris@97 261
Chris@158 262 "resizedTo-\(name)": \(
Chris@158 263 compareMatrices
Chris@158 264 (mat.resizedTo { rows = 2, columns = 2 }
Chris@158 265 (newMatrix (ColumnMajor ()) [[1,4],[2,5],[3,6]]))
Chris@159 266 (newMatrix (ColumnMajor ()) [[1,4],[2,5]]) and
Chris@158 267 compareMatrices
Chris@158 268 (mat.resizedTo { rows = 3, columns = 4 }
Chris@158 269 (newMatrix (ColumnMajor ()) [[1,4],[2,5],[3,6]]))
Chris@158 270 (newMatrix (ColumnMajor ()) [[1,4,0],[2,5,0],[3,6,0],[0,0,0]]) and
Chris@158 271 compareMatrices
Chris@158 272 (mat.resizedTo { rows = 1, columns = 1 }
Chris@158 273 (newMatrix (ColumnMajor ()) [[1,4],[2,5],[3,6]]))
Chris@202 274 (newMatrix (RowMajor ()) [[1]]) and
Chris@202 275 compareMatrices
Chris@202 276 (mat.resizedTo { rows = 2, columns = 3 }
Chris@202 277 (mat.zeroSizeMatrix ()))
Chris@202 278 (newMatrix (RowMajor ()) [[0,0,0],[0,0,0]])
Chris@158 279 ),
Chris@158 280
Chris@158 281 "zeroSizeMatrix-\(name)": \(
Chris@158 282 compareMatrices
Chris@158 283 (mat.zeroSizeMatrix ())
Chris@158 284 (newMatrix (ColumnMajor ()) [])
Chris@158 285 ),
Chris@158 286
Chris@161 287 "asRows-\(name)": \(
Chris@161 288 compare
Chris@218 289 (map vec.list
Chris@241 290 (mat.asRows (newMatrix (ColumnMajor ()) [[1,4],[0,5],[3,6]])))
Chris@241 291 [[1,0,3],[4,5,6]];
Chris@161 292 ),
Chris@161 293
Chris@161 294 "asColumns-\(name)": \(
Chris@161 295 compare
Chris@218 296 (map vec.list
Chris@241 297 (mat.asColumns (newMatrix (ColumnMajor ()) [[1,4],[0,5],[3,6]])))
Chris@241 298 [[1,4],[0,5],[3,6]];
Chris@161 299 ),
Chris@161 300
Chris@178 301 "concat-horiz-\(name)": \(
Chris@177 302 compareMatrices
Chris@177 303 (mat.concat (Horizontal ())
Chris@241 304 [(newMatrix (ColumnMajor ()) [[1,4],[0,5]]),
Chris@177 305 (newMatrix (RowMajor ()) [[3],[6]])])
Chris@241 306 (newMatrix (ColumnMajor ()) [[1,4],[0,5],[3,6]])
Chris@177 307 ),
Chris@177 308
Chris@178 309 "concatFail-horiz-\(name)": \(
Chris@178 310 try
Chris@178 311 \() (mat.concat (Horizontal ())
Chris@241 312 [(newMatrix (ColumnMajor ()) [[1,4],[0,5]]),
Chris@178 313 (newMatrix (ColumnMajor ()) [[3],[6]])]);
Chris@178 314 false
Chris@178 315 catch FailureException e:
Chris@178 316 true
Chris@178 317 yrt
Chris@178 318 ),
Chris@178 319
Chris@178 320 "concat-vert-\(name)": \(
Chris@178 321 compareMatrices
Chris@178 322 (mat.concat (Vertical ())
Chris@241 323 [(newMatrix (ColumnMajor ()) [[1,4],[0,5]]),
Chris@178 324 (newMatrix (RowMajor ()) [[3,6]])])
Chris@241 325 (newMatrix (ColumnMajor ()) [[1,4,3],[0,5,6]])
Chris@178 326 ),
Chris@178 327
Chris@178 328 "concatFail-vert-\(name)": \(
Chris@178 329 try
Chris@178 330 \() (mat.concat (Vertical ())
Chris@241 331 [(newMatrix (ColumnMajor ()) [[1,4],[0,5]]),
Chris@178 332 (newMatrix (RowMajor ()) [[3],[6]])]);
Chris@178 333 false
Chris@178 334 catch FailureException e:
Chris@178 335 true
Chris@178 336 yrt
Chris@178 337 ),
Chris@178 338
Chris@187 339 "rowSlice-\(name)": \(
Chris@187 340 compareMatrices
Chris@241 341 (mat.rowSlice 1 2 (newMatrix (RowMajor ()) [[1,0],[3,4],[0,6],[7,8]]))
Chris@241 342 (newMatrix (RowMajor ()) [[3,4],[0,6]])
Chris@187 343 ),
Chris@187 344
Chris@187 345 "columnSlice-\(name)": \(
Chris@187 346 compareMatrices
Chris@241 347 (mat.columnSlice 1 2 (newMatrix (RowMajor ()) [[1,0,3,4],[0,6,7,8]]))
Chris@241 348 (newMatrix (RowMajor ()) [[0,3],[6,7]])
Chris@187 349 ),
Chris@187 350
Chris@242 351 "sparsity-\(name)": \(
Chris@242 352 compare (mat.sparsity (newMatrix (ColumnMajor ()) [[1,2,0],[0,5,0]])) (3/6) and
Chris@242 353 compare (mat.sparsity (newMatrix (ColumnMajor ()) [[1,2,3],[4,5,6]])) (6/6) and
Chris@242 354 compare (mat.sparsity (newMatrix (ColumnMajor ()) [[0,0,0],[0,0,0]])) 0
Chris@242 355 ),
Chris@242 356
Chris@243 357 "toSparse-\(name)": \(
Chris@243 358 m = newMatrix (ColumnMajor ()) [[1,2,0],[-1,-4,6],[0,0,3]];
Chris@243 359 compareMatrices (mat.toSparse m) m and
Chris@243 360 compareMatrices (mat.toDense (mat.toSparse m)) m and
Chris@243 361 compare (mat.sparsity (mat.toSparse m)) (6/9)
Chris@243 362 ),
Chris@243 363
Chris@243 364 "toDense-\(name)": \(
Chris@243 365 m = newMatrix (ColumnMajor ()) [[1,2,0],[-1,-4,6],[0,0,3]];
Chris@243 366 compareMatrices (mat.toDense m) m and
Chris@243 367 compareMatrices (mat.toSparse (mat.toDense m)) m
Chris@243 368 ),
Chris@243 369
Chris@243 370 "thresholded-\(name)": \(
Chris@243 371 m = newMatrix (ColumnMajor ()) [[1,2,0],[-1,-4,6],[0,0,3]];
Chris@243 372 compareMatrices
Chris@243 373 (mat.thresholded 2 m)
Chris@243 374 (newMatrix (ColumnMajor ()) [[0,0,0],[0,-4,6],[0,0,3]]) and
Chris@243 375 compare (mat.sparsity (mat.thresholded 2 m)) (3/9)
Chris@243 376 ),
Chris@243 377
Chris@99 378 ]);
Chris@99 379
Chris@238 380 colhash = makeTests "column-dense" id;
Chris@238 381 rowhash = makeTests "row-dense" mat.flipped;
Chris@243 382 sparsecolhash = makeTests "column-sparse" mat.toSparse;
Chris@241 383
Chris@241 384 // there are two possible orders for constructing a sparse row-major
Chris@241 385 // matrix from a dense col-major one, so test them both:
Chris@243 386 sparserowhash1 = makeTests "row-sparse-a" (mat.toSparse . mat.flipped);
Chris@243 387 sparserowhash2 = makeTests "row-sparse-b" (mat.flipped . mat.toSparse);
Chris@99 388
Chris@99 389 all = [:];
Chris@241 390 for [ colhash, rowhash, sparsecolhash, sparserowhash1, sparserowhash2 ] do h:
Chris@238 391 for (keys h) do k: all[k] := h[k] done;
Chris@238 392 done;
Chris@99 393
Chris@99 394 all is hash<string, () -> boolean>;
Chris@99 395
Chris@99 396