Mercurial > octave

comparison src/OPERATORS/op-sm-m.cc @ 11586:12df7854fa7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip trailing whitespace from source files
author John W. Eaton <jwe@octave.org>
date Thu, 20 Jan 2011 17:24:59 -0500
parents fd0a3ac60b0e
children 72c96de7a403
comparison
equal deleted inserted replaced
11585:1473d0cf86d2 11586:12df7854fa7c
48 48
49 DEFBINOP (div, sparse_matrix, matrix) 49 DEFBINOP (div, sparse_matrix, matrix)
50 { 50 {
51 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_matrix&); 51 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_matrix&);
52 MatrixType typ = v2.matrix_type (); 52 MatrixType typ = v2.matrix_type ();
53 53
54 Matrix ret = xdiv (v1.matrix_value (), v2.matrix_value (), typ); 54 Matrix ret = xdiv (v1.matrix_value (), v2.matrix_value (), typ);
55 55
56 v2.matrix_type (typ); 56 v2.matrix_type (typ);
57 return ret; 57 return ret;
58 } 58 }
78 } 78 }
79 else 79 else
80 { 80 {
81 MatrixType typ = v1.matrix_type (); 81 MatrixType typ = v1.matrix_type ();
82 82
83 Matrix ret = xleftdiv (v1.sparse_matrix_value (), 83 Matrix ret = xleftdiv (v1.sparse_matrix_value (),
84 v2.matrix_value (), typ); 84 v2.matrix_value (), typ);
85 85
86 v1.matrix_type (typ); 86 v1.matrix_type (typ);
87 return ret; 87 return ret;
88 } 88 }
101 DEFBINOP_FN (el_div, sparse_matrix, matrix, quotient) 101 DEFBINOP_FN (el_div, sparse_matrix, matrix, quotient)
102 102
103 DEFBINOP (el_pow, sparse_matrix, matrix) 103 DEFBINOP (el_pow, sparse_matrix, matrix)
104 { 104 {
105 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_matrix&); 105 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_matrix&);
106 106
107 return octave_value (elem_xpow (v1.sparse_matrix_value (), 107 return octave_value (elem_xpow (v1.sparse_matrix_value (),
108 SparseMatrix (v2.matrix_value ()))); 108 SparseMatrix (v2.matrix_value ())));
109 } 109 }
110 110
111 DEFBINOP (el_ldiv, sparse_matrix, matrix) 111 DEFBINOP (el_ldiv, sparse_matrix, matrix)
112 { 112 {
113 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_matrix&); 113 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_matrix&);
114 114
115 return octave_value 115 return octave_value
116 (quotient (v2.matrix_value (), v1.sparse_matrix_value ())); 116 (quotient (v2.matrix_value (), v1.sparse_matrix_value ()));
117 } 117 }
118 118
119 DEFBINOP_FN (el_and, sparse_matrix, matrix, mx_el_and) 119 DEFBINOP_FN (el_and, sparse_matrix, matrix, mx_el_and)