Mercurial > hg > octave-lyh
diff liboctave/fNDArray.cc @ 10329:83fa590b8a09
simplify min/max definitions in liboctave
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Wed, 17 Feb 2010 10:40:36 +0100 |
parents | 07ebe522dac2 |
children | 12884915a8e4 |
line wrap: on
line diff
--- a/liboctave/fNDArray.cc +++ b/liboctave/fNDArray.cc @@ -939,41 +939,7 @@ return is; } -FloatNDArray -min (float s, const FloatNDArray& m) -{ - return do_sm_binary_op<FloatNDArray> (s, m, mx_inline_xmin); -} - -FloatNDArray -min (const FloatNDArray& m, float s) -{ - return do_ms_binary_op<FloatNDArray> (m, s, mx_inline_xmin); -} - -FloatNDArray -min (const FloatNDArray& a, const FloatNDArray& b) -{ - return do_mm_binary_op<FloatNDArray> (a, b, mx_inline_xmin, "min"); -} - -FloatNDArray -max (float s, const FloatNDArray& m) -{ - return do_sm_binary_op<FloatNDArray> (s, m, mx_inline_xmax); -} - -FloatNDArray -max (const FloatNDArray& m, float s) -{ - return do_ms_binary_op<FloatNDArray> (m, s, mx_inline_xmax); -} - -FloatNDArray -max (const FloatNDArray& a, const FloatNDArray& b) -{ - return do_mm_binary_op<FloatNDArray> (a, b, mx_inline_xmax, "max"); -} +MINMAX_FCNS (FloatNDArray, float) NDS_CMP_OPS (FloatNDArray, float) NDS_BOOL_OPS (FloatNDArray, float)