Mercurial > octave

changeset 20894:e528d7ab1cad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rand.cc: Overhaul file to make use of new C++ archetype. * rand.cc (do_rand): Declare variables as late as possible. Eliminate '{', '}' around code blocks with a single statement. Delete else statement when first of if statement is error(). Delete unused goto label "done:". * rand.cc (Frand, Frandn, Frande): Simplify code to single line. * rand.cc (Frandg, Frandp): Don't use retval. Delete else statement when first of if statement is error(). * rand.cc (Frandperm): Delete unused retval variable.
author Rik <rik@octave.org>
date Mon, 14 Dec 2015 14:16:19 -0800
parents 384ff5aa9437
children 7697a3433e37
files libinterp/corefcn/rand.cc
diffstat 1 files changed, 49 insertions(+), 96 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/rand.cc	Mon Dec 14 12:59:29 2015 -0800
+++ b/libinterp/corefcn/rand.cc	Mon Dec 14 14:16:19 2015 -0800
@@ -57,19 +57,10 @@
 do_rand (const octave_value_list& args, int nargin, const char *fcn,
          const std::string& distribution, bool additional_arg = false)
 {
-  octave_value retval;
   NDArray a;
   int idx = 0;
-  dim_vector dims;
   bool is_single = false;
 
-  unwind_protect frame;
-  // Restore current distribution on any exit.
-  frame.add_fcn (octave_rand::distribution,
-                 octave_rand::distribution ());
-
-  octave_rand::distribution (distribution);
-
   if (nargin > 0 && args(nargin-1).is_string ())
     {
       std::string s_arg = args(nargin-1).string_value ();
@@ -98,6 +89,16 @@
         }
     }
 
+  octave_value retval;
+  dim_vector dims;
+
+  unwind_protect frame;
+  // Restore current distribution on any exit.
+  frame.add_fcn (octave_rand::distribution,
+                 octave_rand::distribution ());
+
+  octave_rand::distribution (distribution);
+
   switch (nargin)
     {
     case 0:
@@ -111,6 +112,7 @@
             dims(0) = 1;
             dims(1) = 1;
           }
+
         goto gen_matrix;
       }
       break;
@@ -124,37 +126,21 @@
             std::string s_arg = tmp.string_value ();
 
             if (s_arg == "dist")
-              {
-                retval = octave_rand::distribution ();
-              }
+              retval = octave_rand::distribution ();
             else if (s_arg == "seed")
-              {
-                retval = octave_rand::seed ();
-              }
+              retval = octave_rand::seed ();
             else if (s_arg == "state" || s_arg == "twister")
-              {
-                retval = octave_rand::state (fcn);
-              }
+              retval = octave_rand::state (fcn);
             else if (s_arg == "uniform")
-              {
-                octave_rand::uniform_distribution ();
-              }
+              octave_rand::uniform_distribution ();
             else if (s_arg == "normal")
-              {
-                octave_rand::normal_distribution ();
-              }
+              octave_rand::normal_distribution ();
             else if (s_arg == "exponential")
-              {
-                octave_rand::exponential_distribution ();
-              }
+              octave_rand::exponential_distribution ();
             else if (s_arg == "poisson")
-              {
-                octave_rand::poisson_distribution ();
-              }
+              octave_rand::poisson_distribution ();
             else if (s_arg == "gamma")
-              {
-                octave_rand::gamma_distribution ();
-              }
+              octave_rand::gamma_distribution ();
             else
               error ("%s: unrecognized string argument", fcn);
           }
@@ -164,42 +150,36 @@
 
             if (xisnan (dval))
               error ("%s: NaN is invalid matrix dimension", fcn);
-            else
-              {
-                dims.resize (2);
+
+            dims.resize (2);
 
-                dims(0) = NINTbig (tmp.double_value ());
-                dims(1) = NINTbig (tmp.double_value ());
+            dims(0) = NINTbig (tmp.double_value ());
+            dims(1) = NINTbig (tmp.double_value ());
 
-                goto gen_matrix;
-              }
+            goto gen_matrix;
           }
         else if (tmp.is_range ())
           {
             Range r = tmp.range_value ();
 
-            if (r.all_elements_are_ints ())
-              {
-                octave_idx_type n = r.numel ();
+            if (! r.all_elements_are_ints ())
+              error ("%s: all elements of range must be integers", fcn);
 
-                dims.resize (n);
+            octave_idx_type n = r.numel ();
 
-                octave_idx_type base = NINTbig (r.base ());
-                octave_idx_type incr = NINTbig (r.inc ());
+            dims.resize (n);
 
-                for (octave_idx_type i = 0; i < n; i++)
-                  {
-                    // Negative dimensions are treated as zero for Matlab
-                    // compatibility
-                    dims(i) = base >= 0 ? base : 0;
-                    base += incr;
-                  }
+            octave_idx_type base = NINTbig (r.base ());
+            octave_idx_type incr = NINTbig (r.inc ());
 
-                goto gen_matrix;
-
+            for (octave_idx_type i = 0; i < n; i++)
+              {
+                // Negative dimensions treated as zero for Matlab compatibility
+                dims(i) = base >= 0 ? base : 0;
+                base += incr;
               }
-            else
-              error ("%s: all elements of range must be integers", fcn);
+
+            goto gen_matrix;
           }
         else if (tmp.is_matrix_type ())
           {
@@ -220,8 +200,7 @@
 
             for (octave_idx_type i = 0; i < len; i++)
               {
-                // Negative dimensions are treated as zero for Matlab
-                // compatibility
+                // Negative dimensions treated as zero for Matlab compatibility
                 octave_idx_type elt = iv(i);
                 dims(i) = elt >=0 ? elt : 0;
               }
@@ -282,7 +261,7 @@
               {
                 octave_idx_type elt = args(idx+i).xint_value ("%s: dimension must be a scalar or array of integers", fcn);
 
-                // Negative is zero for Matlab compatibility
+                // Negative dimensions treated as zero for Matlab compatibility
                 dims(i) = elt >= 0 ? elt : 0;
               }
 
@@ -292,8 +271,7 @@
       break;
     }
 
-done:
-
+  // No "goto gen_matrix" in code path.  Must be done.
   return retval;
 
 gen_matrix:
@@ -314,8 +292,10 @@
               octave_idx_type len = a.numel ();
               FloatNDArray m (dims);
               float *v = m.fortran_vec ();
+
               for (octave_idx_type i = 0; i < len; i++)
                 v[i] = octave_rand::float_scalar (a(i));
+
               return m;
             }
         }
@@ -336,8 +316,10 @@
               octave_idx_type len = a.numel ();
               NDArray m (dims);
               double *v = m.fortran_vec ();
+
               for (octave_idx_type i = 0; i < len; i++)
                 v[i] = octave_rand::scalar (a(i));
+
               return m;
             }
         }
@@ -435,13 +417,7 @@
 @seealso{randn, rande, randg, randp}\n\
 @end deftypefn")
 {
-  octave_value retval;
-
-  int nargin = args.length ();
-
-  retval = do_rand (args, nargin, "rand", "uniform");
-
-  return retval;
+  return do_rand (args, args.length (), "rand", "uniform");
 }
 
 // FIXME: The old generator (selected when "seed" is set) will not
@@ -564,13 +540,7 @@
 @seealso{rand, rande, randg, randp}\n\
 @end deftypefn")
 {
-  octave_value retval;
-
-  int nargin = args.length ();
-
-  retval = do_rand (args, nargin, "randn", "normal");
-
-  return retval;
+  return do_rand (args, args.length (), "randn", "normal");
 }
 
 /*
@@ -636,13 +606,7 @@
 @seealso{rand, randn, randg, randp}\n\
 @end deftypefn")
 {
-  octave_value retval;
-
-  int nargin = args.length ();
-
-  retval = do_rand (args, nargin, "rande", "exponential");
-
-  return retval;
+  return do_rand (args, args.length (), "rande", "exponential");
 }
 
 /*
@@ -778,16 +742,12 @@
 @seealso{rand, randn, rande, randp}\n\
 @end deftypefn")
 {
-  octave_value retval;
-
   int nargin = args.length ();
 
   if (nargin < 1)
     error ("randg: insufficient arguments");
-  else
-    retval = do_rand (args, nargin, "randg", "gamma", true);
 
-  return retval;
+  return do_rand (args, nargin, "randg", "gamma", true);
 }
 
 /*
@@ -1007,16 +967,12 @@
 @seealso{rand, randn, rande, randg}\n\
 @end deftypefn")
 {
-  octave_value retval;
-
   int nargin = args.length ();
 
   if (nargin < 1)
     error ("randp: insufficient arguments");
-  else
-    retval = do_rand (args, nargin, "randp", "poisson", true);
 
-  return retval;
+  return do_rand (args, nargin, "randp", "poisson", true);
 }
 
 /*
@@ -1121,8 +1077,6 @@
 @seealso{perms}\n\
 @end deftypefn")
 {
-  octave_value retval;
-
 #ifdef USE_UNORDERED_MAP_WITH_TR1
 using std::tr1::unordered_map;
 #else
@@ -1199,7 +1153,6 @@
     }
   else
     {
-
       // Perform the Knuth shuffle of the first m entries
       for (octave_idx_type i = 0; i < m; i++)
         {