Mercurial > hg > octave-lyh

comparison liboctave/CSparse.h @ 8968:91d53dc37f79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add perm * sparse, perm \ sparse, sparse * perm, and sparse / perm operations. Nothing terribly fancy in any of this. There probably is some mechanism for using the permutation vectors and some assign or index method in the sparse classes, but I've never understood all the intricacies. I'm opting for a simple implementation at the cost of possibly duplicating some functionality.
author Jason Riedy <jason@acm.org>
date Tue, 10 Mar 2009 21:54:44 -0400
parents 1bba53c0a38d
children a5035bc7fbfb
comparison
equal deleted inserted replaced
8967:5bbbf482909a 8968:91d53dc37f79
35 #include "MSparse.h" 35 #include "MSparse.h"
36 #include "MSparse-defs.h" 36 #include "MSparse-defs.h"
37 #include "Sparse-op-defs.h" 37 #include "Sparse-op-defs.h"
38 #include "MatrixType.h" 38 #include "MatrixType.h"
39 39
40 class PermMatrix;
40 class DiagMatrix; 41 class DiagMatrix;
41 class ComplexDiagMatrix; 42 class ComplexDiagMatrix;
42 class SparseMatrix; 43 class SparseMatrix;
43 class SparseBoolMatrix; 44 class SparseBoolMatrix;
44 45
496 extern OCTAVE_API SparseComplexMatrix operator - (const ComplexDiagMatrix&, const SparseComplexMatrix&); 497 extern OCTAVE_API SparseComplexMatrix operator - (const ComplexDiagMatrix&, const SparseComplexMatrix&);
497 extern OCTAVE_API SparseComplexMatrix operator - (const SparseMatrix&, const ComplexDiagMatrix&); 498 extern OCTAVE_API SparseComplexMatrix operator - (const SparseMatrix&, const ComplexDiagMatrix&);
498 extern OCTAVE_API SparseComplexMatrix operator - (const SparseComplexMatrix&, const DiagMatrix&); 499 extern OCTAVE_API SparseComplexMatrix operator - (const SparseComplexMatrix&, const DiagMatrix&);
499 extern OCTAVE_API SparseComplexMatrix operator - (const SparseComplexMatrix&, const ComplexDiagMatrix&); 500 extern OCTAVE_API SparseComplexMatrix operator - (const SparseComplexMatrix&, const ComplexDiagMatrix&);
500 501
502 extern OCTAVE_API SparseComplexMatrix operator * (const PermMatrix&,
503 const SparseComplexMatrix&);
504 extern OCTAVE_API SparseComplexMatrix operator * (const SparseComplexMatrix&,
505 const PermMatrix&);
506
501 extern OCTAVE_API SparseComplexMatrix min (const Complex& c, 507 extern OCTAVE_API SparseComplexMatrix min (const Complex& c,
502 const SparseComplexMatrix& m); 508 const SparseComplexMatrix& m);
503 extern OCTAVE_API SparseComplexMatrix min (const SparseComplexMatrix& m, 509 extern OCTAVE_API SparseComplexMatrix min (const SparseComplexMatrix& m,
504 const Complex& c); 510 const Complex& c);
505 extern OCTAVE_API SparseComplexMatrix min (const SparseComplexMatrix& a, 511 extern OCTAVE_API SparseComplexMatrix min (const SparseComplexMatrix& a,