comparison yetilab/matrix/test/test_matrix.yeti @ 280:7f000ae124db

Make convolver work. Ugly though
author Chris Cannam
date Tue, 28 May 2013 20:41:11 +0100
parents 678477bf617c
children
comparison
equal deleted inserted replaced
279:3aacfde637fd 280:7f000ae124db
395 [(newMatrix (ColumnMajor ()) [[1,4],[0,5]]), 395 [(newMatrix (ColumnMajor ()) [[1,4],[0,5]]),
396 (newMatrix (RowMajor ()) [[3],[6]])]) 396 (newMatrix (RowMajor ()) [[3],[6]])])
397 (newMatrix (ColumnMajor ()) [[1,4],[0,5],[3,6]]) 397 (newMatrix (ColumnMajor ()) [[1,4],[0,5],[3,6]])
398 ), 398 ),
399 399
400 "concatEmpty-horiz-\(name)": \(
401 compareMatrices
402 (mat.concat (Horizontal ())
403 [(newMatrix (ColumnMajor ()) [[]]),
404 (newMatrix (RowMajor ()) [[]]),
405 (mat.zeroSizeMatrix ())])
406 (mat.zeroSizeMatrix ());
407 ),
408
400 "sparseConcat-horiz-\(name)": \( 409 "sparseConcat-horiz-\(name)": \(
401 s = mat.concat (Horizontal ()) 410 s = mat.concat (Horizontal ())
402 [mat.toSparse (newMatrix (ColumnMajor ()) [[1,4],[0,5]]), 411 [mat.toSparse (newMatrix (ColumnMajor ()) [[1,4],[0,5]]),
403 mat.toSparse (newMatrix (RowMajor ()) [[3],[6]])]; 412 mat.toSparse (newMatrix (RowMajor ()) [[3],[6]])];
404 compareMatrices s (newMatrix (ColumnMajor ()) [[1,4],[0,5],[3,6]]) and 413 compareMatrices s (newMatrix (ColumnMajor ()) [[1,4],[0,5],[3,6]]) and