Mercurial > octave
diff src/OPERATORS/op-s-cs.cc @ 9621:3ee9029931b3
fix scalar complex-real comparisons
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Sun, 06 Sep 2009 07:41:34 +0200 |
| parents | eb63fbe60fab |
| children | ac4b97c6bf8b |
line wrap: on
line diff
--- a/src/OPERATORS/op-s-cs.cc Sat Sep 05 21:00:44 2009 -0400 +++ b/src/OPERATORS/op-s-cs.cc Sun Sep 06 07:41:34 2009 +0200 @@ -70,47 +70,12 @@ return octave_value (v2.complex_value () / d); } -DEFBINOP (lt, scalar, complex) -{ - CAST_BINOP_ARGS (const octave_scalar&, const octave_complex&); - - return v1.double_value () < real (v2.complex_value ()); -} - -DEFBINOP (le, scalar, complex) -{ - CAST_BINOP_ARGS (const octave_scalar&, const octave_complex&); - - return v1.double_value () <= real (v2.complex_value ()); -} - -DEFBINOP (eq, scalar, complex) -{ - CAST_BINOP_ARGS (const octave_scalar&, const octave_complex&); - - return v1.double_value () == v2.complex_value (); -} - -DEFBINOP (ge, scalar, complex) -{ - CAST_BINOP_ARGS (const octave_scalar&, const octave_complex&); - - return v1.double_value () >= real (v2.complex_value ()); -} - -DEFBINOP (gt, scalar, complex) -{ - CAST_BINOP_ARGS (const octave_scalar&, const octave_complex&); - - return v1.double_value () > real (v2.complex_value ()); -} - -DEFBINOP (ne, scalar, complex) -{ - CAST_BINOP_ARGS (const octave_scalar&, const octave_complex&); - - return v1.double_value () != v2.complex_value (); -} +DEFCMPLXCMPOP_OP (lt, scalar, complex, <) +DEFCMPLXCMPOP_OP (le, scalar, complex, <=) +DEFCMPLXCMPOP_OP (eq, scalar, complex, ==) +DEFCMPLXCMPOP_OP (ge, scalar, complex, >=) +DEFCMPLXCMPOP_OP (gt, scalar, complex, >) +DEFCMPLXCMPOP_OP (ne, scalar, complex, !=) DEFBINOP_OP (el_mul, scalar, complex, *)