Mercurial > octave

diff libinterp/corefcn/balance.cc @ 20909:03e4ddd49396

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
omit unnecessary nargout checks * paramdemo.cc, __ichol__.cc, __ilu__.cc, balance.cc, dassl.cc, eig.cc, ellipj.cc, filter.cc, givens.cc, hess.cc, lsode.cc, lu.cc, mgorth.cc, nproc.cc, pr-output.cc, quad.cc, quadcc.cc, sylvester.cc, urlwrite.cc, variables.cc, ccolamd.cc, colamd.cc, qr.cc: Don't call print_usage based on value of nargout. If nargout doesn't alter function behavior and returning extra values is inexpensive, simply return them instead of checking nargout.
author John W. Eaton <jwe@octave.org>
date Wed, 16 Dec 2015 11:41:11 -0500
parents f1b2a2dbc0e1
children 6f0bd96f93c0
line wrap: on
line diff
--- a/libinterp/corefcn/balance.cc	Wed Dec 16 10:25:05 2015 +0100
+++ b/libinterp/corefcn/balance.cc	Wed Dec 16 11:41:11 2015 -0500
@@ -95,7 +95,7 @@
 
   int nargin = args.length ();
 
-  if (nargin < 1 || nargin > 3 || nargout < 0 || nargout > 4)
+  if (nargin < 1 || nargin > 3 || nargout < 0)
     print_usage ();
 
   // determine if it's AEP or GEP
@@ -160,17 +160,12 @@
               if (nargout == 0 || nargout == 1)
                 retval = ovl (result.balanced_matrix ());
               else if (nargout == 2)
-                {
-                  retval = ovl (result.balancing_matrix (),
-                                result.balanced_matrix ());
-                }
+                retval = ovl (result.balancing_matrix (),
+                              result.balanced_matrix ());
               else
-                {
-                  retval = ovl (result.scaling_vector (),
-                                result.permuting_vector (),
-                                result.balanced_matrix ());
-                }
-
+                retval = ovl (result.scaling_vector (),
+                              result.permuting_vector (),
+                              result.balanced_matrix ());
             }
           else
             {
@@ -179,16 +174,12 @@
               if (nargout == 0 || nargout == 1)
                 retval = ovl (result.balanced_matrix ());
               else if (nargout == 2)
-                {
-                  retval = ovl (result.balancing_matrix (),
-                                result.balanced_matrix ());
-                }
+                retval = ovl (result.balancing_matrix (),
+                              result.balanced_matrix ());
               else
-                {
-                  retval = ovl (result.scaling_vector (),
-                                result.permuting_vector (),
-                                result.balanced_matrix ());
-                }
+                retval = ovl (result.scaling_vector (),
+                              result.permuting_vector (),
+                              result.balanced_matrix ());
             }
         }
       else
@@ -200,16 +191,12 @@
               if (nargout == 0 || nargout == 1)
                 retval = ovl (result.balanced_matrix ());
               else if (nargout == 2)
-                {
-                  retval = ovl (result.balancing_matrix (),
-                                result.balanced_matrix ());
-                }
+                retval = ovl (result.balancing_matrix (),
+                              result.balanced_matrix ());
               else
-                {
-                  retval = ovl (result.scaling_vector (),
-                                result.permuting_vector (),
-                                result.balanced_matrix ());
-                }
+                retval = ovl (result.scaling_vector (),
+                              result.permuting_vector (),
+                              result.balanced_matrix ());
             }
           else
             {
@@ -218,16 +205,12 @@
               if (nargout == 0 || nargout == 1)
                 retval = ovl (result.balanced_matrix ());
               else if (nargout == 2)
-                {
-                  retval = ovl (result.balancing_matrix (),
-                                result.balanced_matrix ());
-                }
+                retval = ovl (result.balancing_matrix (),
+                              result.balanced_matrix ());
               else
-                {
-                  retval = ovl (result.scaling_vector (),
-                                result.permuting_vector (),
-                                result.balanced_matrix ());
-                }
+                retval = ovl (result.scaling_vector (),
+                              result.permuting_vector (),
+                              result.balanced_matrix ());
             }
         }
     }