comparison liboctave/dSparse.h @ 8964:f4f4d65faaa0

Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Date: Sun, 8 Mar 2009 16:28:18 -0400 These preserve sparsity, so eye(5) * sprand (5, 5, .2) is *sparse* and not dense. This may affect people who use multiplication by eye() rather than full(). The liboctave routines do *not* check if arguments are scalars in disguise. There is a type problem with checking at that level. I suspect we want diag * "sparse scalar" to stay diagonal, but we have to return a sparse matrix at the liboctave. Rather than worrying about that in liboctave, we cope with it when binding to Octave and return the correct higher-level type. The implementation is in Sparse-diag-op-defs.h rather than Sparse-op-defs.h to limit recompilation. And the implementations are templates rather than macros to produce better compiler errors and debugging information.
author Jason Riedy <jason@acm.org>
date Mon, 09 Mar 2009 17:49:13 -0400
parents eb63fbe60fab
children 1bba53c0a38d
comparison
equal deleted inserted replaced
8963:d1eab3ddb02d 8964:f4f4d65faaa0
27 #include "dMatrix.h" 27 #include "dMatrix.h"
28 #include "dNDArray.h" 28 #include "dNDArray.h"
29 #include "CMatrix.h" 29 #include "CMatrix.h"
30 #include "dColVector.h" 30 #include "dColVector.h"
31 #include "CColVector.h" 31 #include "CColVector.h"
32 #include "dDiagMatrix.h"
33 32
34 #include "DET.h" 33 #include "DET.h"
35 #include "MSparse.h" 34 #include "MSparse.h"
36 #include "MSparse-defs.h" 35 #include "MSparse-defs.h"
37 #include "Sparse-op-defs.h" 36 #include "Sparse-op-defs.h"
38 #include "MatrixType.h" 37 #include "MatrixType.h"
39 38
39 class DiagMatrix;
40 class SparseComplexMatrix; 40 class SparseComplexMatrix;
41 class SparseBoolMatrix; 41 class SparseBoolMatrix;
42 42
43 class 43 class
44 OCTAVE_API 44 OCTAVE_API
449 extern OCTAVE_API Matrix operator * (const SparseMatrix& a, 449 extern OCTAVE_API Matrix operator * (const SparseMatrix& a,
450 const Matrix& b); 450 const Matrix& b);
451 extern OCTAVE_API Matrix trans_mul (const SparseMatrix& a, 451 extern OCTAVE_API Matrix trans_mul (const SparseMatrix& a,
452 const Matrix& b); 452 const Matrix& b);
453 453
454 extern OCTAVE_API SparseMatrix operator * (const DiagMatrix&, const SparseMatrix&);
455 extern OCTAVE_API SparseMatrix operator * (const SparseMatrix&, const DiagMatrix&);
456
454 extern OCTAVE_API SparseMatrix min (double d, const SparseMatrix& m); 457 extern OCTAVE_API SparseMatrix min (double d, const SparseMatrix& m);
455 extern OCTAVE_API SparseMatrix min (const SparseMatrix& m, double d); 458 extern OCTAVE_API SparseMatrix min (const SparseMatrix& m, double d);
456 extern OCTAVE_API SparseMatrix min (const SparseMatrix& a, const SparseMatrix& b); 459 extern OCTAVE_API SparseMatrix min (const SparseMatrix& a, const SparseMatrix& b);
457 460
458 extern OCTAVE_API SparseMatrix max (double d, const SparseMatrix& m); 461 extern OCTAVE_API SparseMatrix max (double d, const SparseMatrix& m);