Mercurial > hg > octave-avbm

comparison src/OPERATORS/op-cm-sm.cc @ 5785:6b9cec830d72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-05-03 19:32:46 by dbateman]
author dbateman
date Wed, 03 May 2006 19:32:48 +0000
parents 8d7162924bd3
children 8e0f1eda266b
comparison
equal deleted inserted replaced
5784:70f7659d0fb9 5785:6b9cec830d72
47 47
48 DEFBINOP (div, complex_matrix, sparse_matrix) 48 DEFBINOP (div, complex_matrix, sparse_matrix)
49 { 49 {
50 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_sparse_matrix&); 50 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_sparse_matrix&);
51 51
52 SparseType typ = v2.sparse_type (); 52 MatrixType typ = v2.matrix_type ();
53 53
54 ComplexMatrix ret = xdiv (v1.complex_matrix_value (), 54 ComplexMatrix ret = xdiv (v1.complex_matrix_value (),
55 v2.sparse_matrix_value (), typ); 55 v2.sparse_matrix_value (), typ);
56 56
57 v2.sparse_type (typ); 57 v2.matrix_type (typ);
58 return ret; 58 return ret;
59 } 59 }
60 60
61 DEFBINOPX (pow, complex_matrix, sparse_matrix) 61 DEFBINOPX (pow, complex_matrix, sparse_matrix)
62 { 62 {
66 66
67 DEFBINOP (ldiv, complex_matrix, sparse_matrix) 67 DEFBINOP (ldiv, complex_matrix, sparse_matrix)
68 { 68 {
69 CAST_BINOP_ARGS (const octave_complex_matrix&, 69 CAST_BINOP_ARGS (const octave_complex_matrix&,
70 const octave_sparse_matrix&); 70 const octave_sparse_matrix&);
71 MatrixType typ = v1.matrix_type ();
71 72
72 return xleftdiv (v1.complex_matrix_value (), v2.matrix_value ()); 73 ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (),
74 v2.matrix_value (), typ);
75
76 v1.matrix_type (typ);
77 return ret;
73 } 78 }
74 79
75 DEFBINOP_FN (lt, complex_matrix, sparse_matrix, mx_el_lt) 80 DEFBINOP_FN (lt, complex_matrix, sparse_matrix, mx_el_lt)
76 DEFBINOP_FN (le, complex_matrix, sparse_matrix, mx_el_le) 81 DEFBINOP_FN (le, complex_matrix, sparse_matrix, mx_el_le)
77 DEFBINOP_FN (eq, complex_matrix, sparse_matrix, mx_el_eq) 82 DEFBINOP_FN (eq, complex_matrix, sparse_matrix, mx_el_eq)