Mercurial > octave-nkf

comparison src/OPERATORS/op-s-sm.cc @ 5322:22994a5730f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2005-04-29 13:04:24 by dbateman]
author dbateman
date Fri, 29 Apr 2005 13:04:25 +0000
parents 4c8a2e4e0717
children 667ad2becb63
comparison
equal deleted inserted replaced
5321:84b72a402b86 5322:22994a5730f9
42 DEFBINOP_OP (sub, scalar, sparse_matrix, -) 42 DEFBINOP_OP (sub, scalar, sparse_matrix, -)
43 DEFBINOP_OP (mul, scalar, sparse_matrix, *) 43 DEFBINOP_OP (mul, scalar, sparse_matrix, *)
44 44
45 DEFBINOP (div, scalar, sparse_matrix) 45 DEFBINOP (div, scalar, sparse_matrix)
46 { 46 {
47 CAST_BINOP_ARGS (const octave_scalar&, const octave_sparse_matrix&); 47 CAST_BINOP_ARGS (const octave_scalar&, octave_sparse_matrix&);
48 48
49 SparseType typ = v2.sparse_type ();
49 Matrix m1 = Matrix (1, 1, v1.double_value ()); 50 Matrix m1 = Matrix (1, 1, v1.double_value ());
50 SparseMatrix m2 = v2.sparse_matrix_value (); 51 SparseMatrix m2 = v2.sparse_matrix_value ();
52 Matrix ret = xdiv (m1, m2, typ);
53 v2.sparse_type (typ);
51 54
52 return xdiv (m1, m2); 55 return ret;
53 } 56 }
54 57
55 DEFBINOP (pow, scalar, sparse_matrix) 58 DEFBINOP (pow, scalar, sparse_matrix)
56 { 59 {
57 CAST_BINOP_ARGS (const octave_scalar&, const octave_sparse_matrix&); 60 CAST_BINOP_ARGS (const octave_scalar&, const octave_sparse_matrix&);