Mercurial > hg > octave-jordi

comparison src/op-s-m.cc @ 2825:60ae49e1284f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-03-25 23:17:36 by jwe]
author jwe
date Tue, 25 Mar 1997 23:32:15 +0000
parents 5bcee07be597
children 8b262e771614
comparison
equal deleted inserted replaced
2824:e56a90687a1e 2825:60ae49e1284f
100 static octave_value 100 static octave_value
101 lt (const octave_value& a1, const octave_value& a2) 101 lt (const octave_value& a1, const octave_value& a2)
102 { 102 {
103 CAST_BINOP_ARGS (const octave_scalar&, const octave_matrix&); 103 CAST_BINOP_ARGS (const octave_scalar&, const octave_matrix&);
104 104
105 BOOL_OP (<, Matrix ()); 105 BOOL_OP (<, boolMatrix ());
106 } 106 }
107 107
108 static octave_value 108 static octave_value
109 le (const octave_value& a1, const octave_value& a2) 109 le (const octave_value& a1, const octave_value& a2)
110 { 110 {
111 CAST_BINOP_ARGS (const octave_scalar&, const octave_matrix&); 111 CAST_BINOP_ARGS (const octave_scalar&, const octave_matrix&);
112 112
113 BOOL_OP (<=, Matrix ()); 113 BOOL_OP (<=, boolMatrix ());
114 } 114 }
115 115
116 static octave_value 116 static octave_value
117 eq (const octave_value& a1, const octave_value& a2) 117 eq (const octave_value& a1, const octave_value& a2)
118 { 118 {
124 static octave_value 124 static octave_value
125 ge (const octave_value& a1, const octave_value& a2) 125 ge (const octave_value& a1, const octave_value& a2)
126 { 126 {
127 CAST_BINOP_ARGS (const octave_scalar&, const octave_matrix&); 127 CAST_BINOP_ARGS (const octave_scalar&, const octave_matrix&);
128 128
129 BOOL_OP (>=, Matrix ()); 129 BOOL_OP (>=, boolMatrix ());
130 } 130 }
131 131
132 static octave_value 132 static octave_value
133 gt (const octave_value& a1, const octave_value& a2) 133 gt (const octave_value& a1, const octave_value& a2)
134 { 134 {
135 CAST_BINOP_ARGS (const octave_scalar&, const octave_matrix&); 135 CAST_BINOP_ARGS (const octave_scalar&, const octave_matrix&);
136 136
137 BOOL_OP (>, Matrix ()); 137 BOOL_OP (>, boolMatrix ());
138 } 138 }
139 139
140 static octave_value 140 static octave_value
141 ne (const octave_value& a1, const octave_value& a2) 141 ne (const octave_value& a1, const octave_value& a2)
142 { 142 {
187 { 187 {
188 CAST_BINOP_ARGS (const octave_scalar&, const octave_matrix&); 188 CAST_BINOP_ARGS (const octave_scalar&, const octave_matrix&);
189 189
190 SC_MX_BOOL_OP (double, s, v1.double_value (), 190 SC_MX_BOOL_OP (double, s, v1.double_value (),
191 Matrix, m, v2.matrix_value (), 191 Matrix, m, v2.matrix_value (),
192 s && m (i, j), Matrix ()); 192 s && m (i, j), boolMatrix ());
193 } 193 }
194 194
195 static octave_value 195 static octave_value
196 el_or (const octave_value& a1, const octave_value& a2) 196 el_or (const octave_value& a1, const octave_value& a2)
197 { 197 {
198 CAST_BINOP_ARGS (const octave_scalar&, const octave_matrix&); 198 CAST_BINOP_ARGS (const octave_scalar&, const octave_matrix&);
199 199
200 SC_MX_BOOL_OP (double, s, v1.double_value (), 200 SC_MX_BOOL_OP (double, s, v1.double_value (),
201 Matrix, m, v2.matrix_value (), 201 Matrix, m, v2.matrix_value (),
202 s || m (i, j), Matrix ()); 202 s || m (i, j), boolMatrix ());
203 } 203 }
204 204
205 static octave_value * 205 static octave_value *
206 matrix_conv (const octave_value& a) 206 matrix_conv (const octave_value& a)
207 { 207 {