Mercurial > octave-dspies

comparison src/OPERATORS/op-dm-sm.cc @ 8967:5bbbf482909a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix omissions adjusting JR's patches
author Jaroslav Hajek <highegg@gmail.com>
date Thu, 12 Mar 2009 11:46:56 +0100
parents 1bba53c0a38d
children b4fdfee405b5
comparison
equal deleted inserted replaced
8966:1bba53c0a38d 8967:5bbbf482909a
66 66
67 MatrixType typ = v2.matrix_type (); 67 MatrixType typ = v2.matrix_type ();
68 return xleftdiv (v1.diag_matrix_value (), v2.sparse_matrix_value (), typ); 68 return xleftdiv (v1.diag_matrix_value (), v2.sparse_matrix_value (), typ);
69 } 69 }
70 70
71 DEFBINOP_OP (add_dm_sm, diag_matrix, sparse_matrix) 71 DEFBINOP (add_dm_sm, diag_matrix, sparse_matrix)
72 { 72 {
73 CAST_BINOP_ARGS (const octave_diag_matrix&, const octave_sparse_matrix&); 73 CAST_BINOP_ARGS (const octave_diag_matrix&, const octave_sparse_matrix&);
74 74
75 if (v2.rows() == 1 && v2.columns() == 1) 75 if (v2.rows() == 1 && v2.columns() == 1)
76 // If v2 is a scalar in disguise, return a diagonal matrix rather than 76 // If v2 is a scalar in disguise, return a diagonal matrix rather than