Mercurial > octave-nkf
changeset 19772:9155bab86647
use 0.0f style constants instead of static_cast<float> (0.0)
* data.cc, det.cc, op-fcm-fcs.cc, op-fcs-fcm.cc, op-fcs-fcs.cc,
op-fcs-fm.cc, op-fcs-fs.cc, op-fm-fcs.cc, op-fs-fcs.cc,
fCDiagMatrix.cc, lo-mappers.cc, mx-ops: Use 0.0f style constants
instead of static_cast<float> (0.0).
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 17 Feb 2015 16:30:52 -0500 |
| parents | 8c2b30cb6001 |
| children | 3fa35defe495 |
| files | libinterp/corefcn/data.cc libinterp/corefcn/det.cc libinterp/operators/op-fcm-fcs.cc libinterp/operators/op-fcs-fcm.cc libinterp/operators/op-fcs-fcs.cc libinterp/operators/op-fcs-fm.cc libinterp/operators/op-fcs-fs.cc libinterp/operators/op-fm-fcs.cc libinterp/operators/op-fs-fcs.cc liboctave/array/fCDiagMatrix.cc liboctave/numeric/lo-mappers.cc liboctave/operators/mx-ops |
| diffstat | 12 files changed, 39 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/data.cc Tue Feb 17 21:37:33 2015 +0100 +++ b/libinterp/corefcn/data.cc Tue Feb 17 16:30:52 2015 -0500 @@ -4668,7 +4668,7 @@ { int expon; gnulib::frexpf (val, &expon); - epsval(i) = std::pow (static_cast <float> (2.0), + epsval(i) = std::pow (2.0f, static_cast <float> (expon - 24)); } }
--- a/libinterp/corefcn/det.cc Tue Feb 17 21:37:33 2015 +0100 +++ b/libinterp/corefcn/det.cc Tue Feb 17 16:30:52 2015 -0500 @@ -157,7 +157,7 @@ MatrixType mtype = rep ? rep -> matrix_type () : MatrixType (); FloatDET det = m.determinant (mtype, info, rcond); retval(1) = rcond; - retval(0) = info == -1 ? static_cast<float>(0.0) : det.value (); + retval(0) = info == -1 ? 0.0f : det.value (); if (rep) rep->matrix_type (mtype); } }
--- a/libinterp/operators/op-fcm-fcs.cc Tue Feb 17 21:37:33 2015 +0100 +++ b/libinterp/operators/op-fcm-fcs.cc Tue Feb 17 16:30:52 2015 -0500 @@ -52,7 +52,7 @@ FloatComplex d = v2.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v1.float_complex_array_value () / d); @@ -97,7 +97,7 @@ FloatComplex d = v2.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v1.float_complex_array_value () / d);
--- a/libinterp/operators/op-fcs-fcm.cc Tue Feb 17 21:37:33 2015 +0100 +++ b/libinterp/operators/op-fcs-fcm.cc Tue Feb 17 16:30:52 2015 -0500 @@ -69,7 +69,7 @@ FloatComplex d = v1.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v2.float_complex_array_value () / d); @@ -102,7 +102,7 @@ FloatComplex d = v1.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v2.float_complex_array_value () / d);
--- a/libinterp/operators/op-fcs-fcs.cc Tue Feb 17 21:37:33 2015 +0100 +++ b/libinterp/operators/op-fcs-fcs.cc Tue Feb 17 16:30:52 2015 -0500 @@ -73,7 +73,7 @@ FloatComplex d = v2.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v1.float_complex_value () / d); @@ -87,7 +87,7 @@ FloatComplex d = v1.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v2.float_complex_value () / d); @@ -108,7 +108,7 @@ FloatComplex d = v2.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v1.float_complex_value () / d); @@ -122,7 +122,7 @@ FloatComplex d = v1.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v2.float_complex_value () / d); @@ -132,16 +132,16 @@ { CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_complex&); - return (v1.float_complex_value () != static_cast<float>(0.0) && - v2.float_complex_value () != static_cast<float>(0.0)); + return (v1.float_complex_value () != 0.0f + && v2.float_complex_value () != 0.0f); } DEFBINOP (el_or, float_complex, float_complex) { CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_complex&); - return (v1.float_complex_value () != static_cast<float>(0.0) || - v2.float_complex_value () != static_cast<float>(0.0)); + return (v1.float_complex_value () != 0.0f + || v2.float_complex_value () != 0.0f); } DEFNDCATOP_FN (fcs_fcs, float_complex, float_complex, float_complex_array,
--- a/libinterp/operators/op-fcs-fm.cc Tue Feb 17 21:37:33 2015 +0100 +++ b/libinterp/operators/op-fcs-fm.cc Tue Feb 17 16:30:52 2015 -0500 @@ -69,7 +69,7 @@ FloatComplex d = v1.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v2.float_array_value () / d); @@ -101,7 +101,7 @@ FloatComplex d = v1.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v2.float_array_value () / d);
--- a/libinterp/operators/op-fcs-fs.cc Tue Feb 17 21:37:33 2015 +0100 +++ b/libinterp/operators/op-fcs-fs.cc Tue Feb 17 16:30:52 2015 -0500 @@ -64,7 +64,7 @@ FloatComplex d = v1.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v2.float_value () / d); @@ -99,7 +99,7 @@ FloatComplex d = v1.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v2.float_value () / d); @@ -109,16 +109,14 @@ { CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); - return (v1.float_complex_value () != static_cast<float>(0.0) && - v2.float_value ()); + return (v1.float_complex_value () != 0.0f && v2.float_value ()); } DEFBINOP (el_or, float_complex, float) { CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); - return (v1.float_complex_value () != static_cast<float>(0.0) || - v2.float_value ()); + return (v1.float_complex_value () != 0.0f || v2.float_value ()); } DEFNDCATOP_FN (fcs_fs, float_complex, float_scalar, float_complex_array,
--- a/libinterp/operators/op-fm-fcs.cc Tue Feb 17 21:37:33 2015 +0100 +++ b/libinterp/operators/op-fm-fcs.cc Tue Feb 17 16:30:52 2015 -0500 @@ -55,7 +55,7 @@ FloatComplex d = v2.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v1.float_array_value () / d); @@ -99,7 +99,7 @@ FloatComplex d = v2.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v1.float_array_value () / d);
--- a/libinterp/operators/op-fs-fcs.cc Tue Feb 17 21:37:33 2015 +0100 +++ b/libinterp/operators/op-fs-fcs.cc Tue Feb 17 16:30:52 2015 -0500 @@ -50,7 +50,7 @@ FloatComplex d = v2.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v1.float_value () / d); @@ -85,7 +85,7 @@ FloatComplex d = v2.float_complex_value (); - if (d == static_cast<float>(0.0)) + if (d == 0.0f) gripe_divide_by_zero (); return octave_value (v1.float_value () / d); @@ -110,8 +110,7 @@ CAST_BINOP_ARGS (const octave_float_scalar&, const octave_float_complex&); return octave_value (v1.float_scalar_value () - && (v2.float_complex_value () - != static_cast<float>(0.0))); + && (v2.float_complex_value () != 0.0f)); } DEFBINOP (el_or, float_scalar, float_complex) @@ -119,8 +118,7 @@ CAST_BINOP_ARGS (const octave_float_scalar&, const octave_float_complex&); return octave_value (v1.float_scalar_value () - || (v2.float_complex_value () - != static_cast<float>(0.0))); + || (v2.float_complex_value () != 0.0f)); } DEFNDCATOP_FN (fs_fcs, float_scalar, float_complex, float_array,
--- a/liboctave/array/fCDiagMatrix.cc Tue Feb 17 21:37:33 2015 +0100 +++ b/liboctave/array/fCDiagMatrix.cc Tue Feb 17 16:30:52 2015 -0500 @@ -374,13 +374,13 @@ info = 0; for (octave_idx_type i = 0; i < length (); i++) { - if (elem (i, i) == static_cast<float> (0.0)) + if (elem (i, i) == 0.0f) { info = -1; return *this; } else - retval.elem (i, i) = static_cast<float> (1.0) / elem (i, i); + retval.elem (i, i) = 1.0f / elem (i, i); } return retval;
--- a/liboctave/numeric/lo-mappers.cc Tue Feb 17 21:37:33 2015 +0100 +++ b/liboctave/numeric/lo-mappers.cc Tue Feb 17 16:30:52 2015 -0500 @@ -461,7 +461,7 @@ FloatComplex asinh (const FloatComplex& x) { - return log (x + sqrt (x*x + static_cast<float>(1.0))); + return log (x + sqrt (x*x + 1.0f)); } FloatComplex @@ -469,14 +469,13 @@ { static FloatComplex i (0, 1); - return i * log ((i + x) / (i - x)) / static_cast<float>(2.0); + return i * log ((i + x) / (i - x)) / 2.0f; } FloatComplex atanh (const FloatComplex& x) { - return log ((static_cast<float>(1.0) + x) / (static_cast<float> - (1.0) - x)) / static_cast<float>(2.0); + return log ((1.0f + x) / (static_cast<float> (1.0) - x)) / 2.0f; } // complex -> bool mappers.
--- a/liboctave/operators/mx-ops Tue Feb 17 21:37:33 2015 +0100 +++ b/liboctave/operators/mx-ops Tue Feb 17 16:30:52 2015 -0500 @@ -49,14 +49,14 @@ m Matrix M dMatrix.h YES 0.0 nda NDArray ND dNDArray.h YES 0.0 s double S NONE NO 0.0 -fcdm FloatComplexDiagMatrix DM fCDiagMatrix.h YES static_cast<float>(0.0) -fcm FloatComplexMatrix M fCMatrix.h YES static_cast<float>(0.0) -fcnda FloatComplexNDArray ND fCNDArray.h YES static_cast<float>(0.0) -fcs FloatComplex S oct-cmplx.h NO static_cast<float>(0.0) -fdm FloatDiagMatrix DM fDiagMatrix.h YES static_cast<float>(0.0) -fm FloatMatrix M fMatrix.h YES static_cast<float>(0.0) -fnda FloatNDArray ND fNDArray.h YES static_cast<float>(0.0) -fs float S NONE NO static_cast<float>(0.0) +fcdm FloatComplexDiagMatrix DM fCDiagMatrix.h YES 0.0f +fcm FloatComplexMatrix M fCMatrix.h YES 0.0f +fcnda FloatComplexNDArray ND fCNDArray.h YES 0.0f +fcs FloatComplex S oct-cmplx.h NO 0.0f +fdm FloatDiagMatrix DM fDiagMatrix.h YES 0.0f +fm FloatMatrix M fMatrix.h YES 0.0f +fnda FloatNDArray ND fNDArray.h YES 0.0f +fs float S NONE NO 0.0f i8 octave_int8 S oct-inttypes.h YES octave_int8::zero int8_t ui8 octave_uint8 S oct-inttypes.h YES octave_uint8::zero uint8_t i16 octave_int16 S oct-inttypes.h YES octave_int16::zero int16_t