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

[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
45 DEFBINOP_OP (mul, sparse_complex_matrix, sparse_matrix, *) 45 DEFBINOP_OP (mul, sparse_complex_matrix, sparse_matrix, *)
46 46
47 DEFBINOP (div, sparse_complex_matrix, sparse_matrix) 47 DEFBINOP (div, sparse_complex_matrix, sparse_matrix)
48 { 48 {
49 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, const octave_sparse_matrix&); 49 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, const octave_sparse_matrix&);
50 SparseType typ = v2.sparse_type (); 50 MatrixType typ = v2.matrix_type ();
51 SparseComplexMatrix ret = xdiv (v1.sparse_complex_matrix_value (), 51 SparseComplexMatrix ret = xdiv (v1.sparse_complex_matrix_value (),
52 v2.sparse_matrix_value (), typ); 52 v2.sparse_matrix_value (), typ);
53 53
54 v2.sparse_type (typ); 54 v2.matrix_type (typ);
55 return ret; 55 return ret;
56 } 56 }
57 57
58 DEFBINOPX (pow, sparse_complex_matrix, sparse_matrix) 58 DEFBINOPX (pow, sparse_complex_matrix, sparse_matrix)
59 { 59 {
62 } 62 }
63 63
64 DEFBINOP (ldiv, sparse_complex_matrix, sparse_matrix) 64 DEFBINOP (ldiv, sparse_complex_matrix, sparse_matrix)
65 { 65 {
66 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, const octave_sparse_matrix&); 66 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, const octave_sparse_matrix&);
67 SparseType typ = v1.sparse_type (); 67 MatrixType typ = v1.matrix_type ();
68 68
69 SparseComplexMatrix ret = xleftdiv (v1.sparse_complex_matrix_value (), 69 SparseComplexMatrix ret = xleftdiv (v1.sparse_complex_matrix_value (),
70 v2.sparse_matrix_value (), typ); 70 v2.sparse_matrix_value (), typ);
71 71
72 v1.sparse_type (typ); 72 v1.matrix_type (typ);
73 return ret; 73 return ret;
74 } 74 }
75 75
76 DEFBINOP_FN (lt, sparse_complex_matrix, sparse_matrix, mx_el_lt) 76 DEFBINOP_FN (lt, sparse_complex_matrix, sparse_matrix, mx_el_lt)
77 DEFBINOP_FN (le, sparse_complex_matrix, sparse_matrix, mx_el_le) 77 DEFBINOP_FN (le, sparse_complex_matrix, sparse_matrix, mx_el_le)