Mercurial > hg > octave-nkf

changeset 20133:277b12eed117

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
oct-norm.cc: Use static_cast<R> (M_PI) for cases where R is not double. * oct-norm.cc: Use static_cast<R> (M_PI) for cases where R is not double.
author Rik <rik@octave.org>
date Tue, 10 Mar 2015 10:28:05 -0700
parents 31e3799b9e27
children ee7159d9a330
files liboctave/numeric/oct-norm.cc
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/numeric/oct-norm.cc
+++ b/liboctave/numeric/oct-norm.cc
@@ -331,7 +331,7 @@
   for (octave_idx_type i = 0; i < nsamp; i++)
     {
       octave_quit ();
-      R fi = i*M_PI/nsamp;
+      R fi = i * static_cast<R> (M_PI) / nsamp;
       R lambda1 = cos (fi);
       R mu1 = sin (fi);
       R lmnr = std::pow (std::pow (std::abs (lambda1), p) +
@@ -364,7 +364,7 @@
   for (octave_idx_type i = 0; i < nsamp; i++)
     {
       octave_quit ();
-      R fi = i*M_PI/nsamp;
+      R fi = i * static_cast<R> (M_PI) / nsamp;
       R lambda1 = cos (fi);
       R mu1 = sin (fi);
       R lmnr = std::pow (std::pow (std::abs (lambda1), p) +
@@ -383,7 +383,7 @@
   for (octave_idx_type i = 0; i < nsamp; i++)
     {
       octave_quit ();
-      R fi = i*M_PI/nsamp;
+      R fi = i * static_cast<R> (M_PI) / nsamp;
       lamcu = CR (cos (fi), sin (fi));
       R nrm1 = vector_norm (lama * lamcu * y + mu * col, p);
       if (nrm1 > nrm)