Mercurial > octave

diff liboctave/numeric/lo-specfun.cc @ 21118:3ac9f47fb04b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Invert pattern if/code/else/err_XXX to if !/err_XXX/code. * daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, load-save.cc, lsode.cc, quad.cc, xnorm.cc, xpow.cc, ov-base-diag.cc, ov-base-mat.cc, ov-base-scalar.cc, ov-base.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-intx.h, ov-perm.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-struct.cc, ov.cc, pt-idx.cc, Array-util.cc, Array.cc, Sparse.cc, lo-specfun.cc, mx-inlines.cc, oct-binmap.h: Invert pattern if/code/else/err_XXX to if !/err_XXX/code.
author Rik <rik@octave.org>
date Wed, 20 Jan 2016 16:08:30 -0800
parents dfcb9d74b253
children 7cac4e7458f2
line wrap: on
line diff
--- a/liboctave/numeric/lo-specfun.cc	Wed Jan 20 15:45:58 2016 -0800
+++ b/liboctave/numeric/lo-specfun.cc	Wed Jan 20 16:08:30 2016 -0800
@@ -2332,20 +2332,18 @@
   Array<double> retval;
   dim_vector dv = a.dims ();
 
-  if (dv == b.dims ())
-    {
-      octave_idx_type nel = dv.numel ();
-
-      retval.resize (dv);
-
-      double *pretval = retval.fortran_vec ();
-
-      for (octave_idx_type i = 0; i < nel; i++)
-        *pretval++ = betainc (x, a(i), b(i));
-    }
-  else
+  if (dv != b.dims ())
     err_betainc_nonconformant (dim_vector (0, 0), dv, b.dims ());
 
+  octave_idx_type nel = dv.numel ();
+
+  retval.resize (dv);
+
+  double *pretval = retval.fortran_vec ();
+
+  for (octave_idx_type i = 0; i < nel; i++)
+    *pretval++ = betainc (x, a(i), b(i));
+
   return retval;
 }
 
@@ -2371,20 +2369,18 @@
   Array<double> retval;
   dim_vector dv = x.dims ();
 
-  if (dv == b.dims ())
-    {
-      octave_idx_type nel = dv.numel ();
-
-      retval.resize (dv);
-
-      double *pretval = retval.fortran_vec ();
-
-      for (octave_idx_type i = 0; i < nel; i++)
-        *pretval++ = betainc (x(i), a, b(i));
-    }
-  else
+  if (dv != b.dims ())
     err_betainc_nonconformant (dv, dim_vector (0, 0), b.dims ());
 
+  octave_idx_type nel = dv.numel ();
+
+  retval.resize (dv);
+
+  double *pretval = retval.fortran_vec ();
+
+  for (octave_idx_type i = 0; i < nel; i++)
+    *pretval++ = betainc (x(i), a, b(i));
+
   return retval;
 }
 
@@ -2394,20 +2390,18 @@
   Array<double> retval;
   dim_vector dv = x.dims ();
 
-  if (dv == a.dims ())
-    {
-      octave_idx_type nel = dv.numel ();
-
-      retval.resize (dv);
-
-      double *pretval = retval.fortran_vec ();
-
-      for (octave_idx_type i = 0; i < nel; i++)
-        *pretval++ = betainc (x(i), a(i), b);
-    }
-  else
+  if (dv != a.dims ())
     err_betainc_nonconformant (dv, a.dims (), dim_vector (0, 0));
 
+  octave_idx_type nel = dv.numel ();
+
+  retval.resize (dv);
+
+  double *pretval = retval.fortran_vec ();
+
+  for (octave_idx_type i = 0; i < nel; i++)
+    *pretval++ = betainc (x(i), a(i), b);
+
   return retval;
 }
 
@@ -2417,20 +2411,18 @@
   Array<double> retval;
   dim_vector dv = x.dims ();
 
-  if (dv == a.dims () && dv == b.dims ())
-    {
-      octave_idx_type nel = dv.numel ();
-
-      retval.resize (dv);
-
-      double *pretval = retval.fortran_vec ();
-
-      for (octave_idx_type i = 0; i < nel; i++)
-        *pretval++ = betainc (x(i), a(i), b(i));
-    }
-  else
+  if (dv != a.dims () || dv != b.dims ())
     err_betainc_nonconformant (dv, a.dims (), b.dims ());
 
+  octave_idx_type nel = dv.numel ();
+
+  retval.resize (dv);
+
+  double *pretval = retval.fortran_vec ();
+
+  for (octave_idx_type i = 0; i < nel; i++)
+    *pretval++ = betainc (x(i), a(i), b(i));
+
   return retval;
 }
 
@@ -2480,20 +2472,18 @@
   Array<float> retval;
   dim_vector dv = a.dims ();
 
-  if (dv == b.dims ())
-    {
-      octave_idx_type nel = dv.numel ();
-
-      retval.resize (dv);
-
-      float *pretval = retval.fortran_vec ();
-
-      for (octave_idx_type i = 0; i < nel; i++)
-        *pretval++ = betainc (x, a(i), b(i));
-    }
-  else
+  if (dv != b.dims ())
     err_betainc_nonconformant (dim_vector (0, 0), dv, b.dims ());
 
+  octave_idx_type nel = dv.numel ();
+
+  retval.resize (dv);
+
+  float *pretval = retval.fortran_vec ();
+
+  for (octave_idx_type i = 0; i < nel; i++)
+    *pretval++ = betainc (x, a(i), b(i));
+
   return retval;
 }
 
@@ -2519,20 +2509,18 @@
   Array<float> retval;
   dim_vector dv = x.dims ();
 
-  if (dv == b.dims ())
-    {
-      octave_idx_type nel = dv.numel ();
-
-      retval.resize (dv);
-
-      float *pretval = retval.fortran_vec ();
-
-      for (octave_idx_type i = 0; i < nel; i++)
-        *pretval++ = betainc (x(i), a, b(i));
-    }
-  else
+  if (dv != b.dims ())
     err_betainc_nonconformant (dv, dim_vector (0, 0), b.dims ());
 
+  octave_idx_type nel = dv.numel ();
+
+  retval.resize (dv);
+
+  float *pretval = retval.fortran_vec ();
+
+  for (octave_idx_type i = 0; i < nel; i++)
+    *pretval++ = betainc (x(i), a, b(i));
+
   return retval;
 }
 
@@ -2542,20 +2530,18 @@
   Array<float> retval;
   dim_vector dv = x.dims ();
 
-  if (dv == a.dims ())
-    {
-      octave_idx_type nel = dv.numel ();
-
-      retval.resize (dv);
-
-      float *pretval = retval.fortran_vec ();
-
-      for (octave_idx_type i = 0; i < nel; i++)
-        *pretval++ = betainc (x(i), a(i), b);
-    }
-  else
+  if (dv != a.dims ())
     err_betainc_nonconformant (dv, a.dims (), dim_vector (0, 0));
 
+  octave_idx_type nel = dv.numel ();
+
+  retval.resize (dv);
+
+  float *pretval = retval.fortran_vec ();
+
+  for (octave_idx_type i = 0; i < nel; i++)
+    *pretval++ = betainc (x(i), a(i), b);
+
   return retval;
 }
 
@@ -2565,20 +2551,18 @@
   Array<float> retval;
   dim_vector dv = x.dims ();
 
-  if (dv == a.dims () && dv == b.dims ())
-    {
-      octave_idx_type nel = dv.numel ();
-
-      retval.resize (dv);
-
-      float *pretval = retval.fortran_vec ();
-
-      for (octave_idx_type i = 0; i < nel; i++)
-        *pretval++ = betainc (x(i), a(i), b(i));
-    }
-  else
+  if (dv != a.dims () || dv != b.dims ())
     err_betainc_nonconformant (dv, a.dims (), b.dims ());
 
+  octave_idx_type nel = dv.numel ();
+
+  retval.resize (dv);
+
+  float *pretval = retval.fortran_vec ();
+
+  for (octave_idx_type i = 0; i < nel; i++)
+    *pretval++ = betainc (x(i), a(i), b(i));
+
   return retval;
 }
 
@@ -3539,20 +3523,18 @@
   Array<double> retval;
   dim_vector dv = a.dims ();
 
-  if (dv == b.dims ())
-    {
-      octave_idx_type nel = dv.numel ();
-
-      retval.resize (dv);
-
-      double *pretval = retval.fortran_vec ();
-
-      for (octave_idx_type i = 0; i < nel; i++)
-        *pretval++ = betaincinv (x, a(i), b(i));
-    }
-  else
+  if (dv != b.dims ())
     err_betaincinv_nonconformant (dim_vector (0, 0), dv, b.dims ());
 
+  octave_idx_type nel = dv.numel ();
+
+  retval.resize (dv);
+
+  double *pretval = retval.fortran_vec ();
+
+  for (octave_idx_type i = 0; i < nel; i++)
+    *pretval++ = betaincinv (x, a(i), b(i));
+
   return retval;
 }
 
@@ -3578,20 +3560,18 @@
   Array<double> retval;
   dim_vector dv = x.dims ();
 
-  if (dv == b.dims ())
-    {
-      octave_idx_type nel = dv.numel ();
-
-      retval.resize (dv);
-
-      double *pretval = retval.fortran_vec ();
-
-      for (octave_idx_type i = 0; i < nel; i++)
-        *pretval++ = betaincinv (x(i), a, b(i));
-    }
-  else
+  if (dv != b.dims ())
     err_betaincinv_nonconformant (dv, dim_vector (0, 0), b.dims ());
 
+  octave_idx_type nel = dv.numel ();
+
+  retval.resize (dv);
+
+  double *pretval = retval.fortran_vec ();
+
+  for (octave_idx_type i = 0; i < nel; i++)
+    *pretval++ = betaincinv (x(i), a, b(i));
+
   return retval;
 }
 
@@ -3601,20 +3581,18 @@
   Array<double> retval;
   dim_vector dv = x.dims ();
 
-  if (dv == a.dims ())
-    {
-      octave_idx_type nel = dv.numel ();
-
-      retval.resize (dv);
-
-      double *pretval = retval.fortran_vec ();
-
-      for (octave_idx_type i = 0; i < nel; i++)
-        *pretval++ = betaincinv (x(i), a(i), b);
-    }
-  else
+  if (dv != a.dims ())
     err_betaincinv_nonconformant (dv, a.dims (), dim_vector (0, 0));
 
+  octave_idx_type nel = dv.numel ();
+
+  retval.resize (dv);
+
+  double *pretval = retval.fortran_vec ();
+
+  for (octave_idx_type i = 0; i < nel; i++)
+    *pretval++ = betaincinv (x(i), a(i), b);
+
   return retval;
 }
 
@@ -3625,20 +3603,18 @@
   Array<double> retval;
   dim_vector dv = x.dims ();
 
-  if (dv == a.dims () && dv == b.dims ())
-    {
-      octave_idx_type nel = dv.numel ();
-
-      retval.resize (dv);
-
-      double *pretval = retval.fortran_vec ();
-
-      for (octave_idx_type i = 0; i < nel; i++)
-        *pretval++ = betaincinv (x(i), a(i), b(i));
-    }
-  else
+  if (dv != a.dims () && dv != b.dims ())
     err_betaincinv_nonconformant (dv, a.dims (), b.dims ());
 
+  octave_idx_type nel = dv.numel ();
+
+  retval.resize (dv);
+
+  double *pretval = retval.fortran_vec ();
+
+  for (octave_idx_type i = 0; i < nel; i++)
+    *pretval++ = betaincinv (x(i), a(i), b(i));
+
   return retval;
 }