Mercurial > octave

diff libinterp/corefcn/xnorm.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 e39e05d90788
children fcac5dbbf9ed
line wrap: on
line diff
--- a/libinterp/corefcn/xnorm.cc	Wed Jan 20 15:45:58 2016 -0800
+++ b/libinterp/corefcn/xnorm.cc	Wed Jan 20 16:08:30 2016 -0800
@@ -46,52 +46,50 @@
   bool issparse = x.is_sparse_type ();
   bool isfloat = x.is_single_type ();
 
-  if (isfloat || x.is_double_type ())
+  if (! isfloat && ! x.is_double_type ())
+    err_wrong_type_arg ("xnorm", x);
+
+  if (x.is_empty ())
+    retval = octave_value (0);
+  else if (isvector)
     {
-      if (x.is_empty ())
-        retval = octave_value (0);
-      else if (isvector)
-        {
-          if (isfloat & iscomplex)
-            retval = xnorm (x.float_complex_column_vector_value (),
-                            p.float_value ());
-          else if (isfloat)
-            retval = xnorm (x.float_column_vector_value (),
-                            p.float_value ());
-          else if (iscomplex)
-            retval = xnorm (x.complex_column_vector_value (),
-                            p.double_value ());
-          else
-            retval = xnorm (x.column_vector_value (),
-                            p.double_value ());
-        }
-      else if (issparse)
-        {
-          if (iscomplex)
-            retval = xnorm (x.sparse_complex_matrix_value (),
-                            p.double_value ());
-          else
-            retval = xnorm (x.sparse_matrix_value (),
-                            p.double_value ());
-        }
+      if (isfloat & iscomplex)
+        retval = xnorm (x.float_complex_column_vector_value (),
+                        p.float_value ());
+      else if (isfloat)
+        retval = xnorm (x.float_column_vector_value (),
+                        p.float_value ());
+      else if (iscomplex)
+        retval = xnorm (x.complex_column_vector_value (),
+                        p.double_value ());
       else
-        {
-          if (isfloat & iscomplex)
-            retval = xnorm (x.float_complex_matrix_value (),
-                            p.float_value ());
-          else if (isfloat)
-            retval = xnorm (x.float_matrix_value (),
-                            p.float_value ());
-          else if (iscomplex)
-            retval = xnorm (x.complex_matrix_value (),
-                            p.double_value ());
-          else
-            retval = xnorm (x.matrix_value (),
-                            p.double_value ());
-        }
+        retval = xnorm (x.column_vector_value (),
+                        p.double_value ());
+    }
+  else if (issparse)
+    {
+      if (iscomplex)
+        retval = xnorm (x.sparse_complex_matrix_value (),
+                        p.double_value ());
+      else
+        retval = xnorm (x.sparse_matrix_value (),
+                        p.double_value ());
     }
   else
-    err_wrong_type_arg ("xnorm", x);
+    {
+      if (isfloat & iscomplex)
+        retval = xnorm (x.float_complex_matrix_value (),
+                        p.float_value ());
+      else if (isfloat)
+        retval = xnorm (x.float_matrix_value (),
+                        p.float_value ());
+      else if (iscomplex)
+        retval = xnorm (x.complex_matrix_value (),
+                        p.double_value ());
+      else
+        retval = xnorm (x.matrix_value (),
+                        p.double_value ());
+    }
 
   return retval;
 }
@@ -104,35 +102,33 @@
   bool issparse = x.is_sparse_type ();
   bool isfloat = x.is_single_type ();
 
-  if (isfloat || x.is_double_type ())
+  if (! isfloat && ! x.is_double_type ())
+    err_wrong_type_arg ("xcolnorms", x);
+
+  if (issparse)
     {
-      if (issparse)
-        {
-          if (iscomplex)
-            retval = xcolnorms (x.sparse_complex_matrix_value (),
-                                p.double_value ());
-          else
-            retval = xcolnorms (x.sparse_matrix_value (),
-                                p.double_value ());
-        }
+      if (iscomplex)
+        retval = xcolnorms (x.sparse_complex_matrix_value (),
+                            p.double_value ());
       else
-        {
-          if (isfloat & iscomplex)
-            retval = xcolnorms (x.float_complex_matrix_value (),
-                                p.float_value ());
-          else if (isfloat)
-            retval = xcolnorms (x.float_matrix_value (),
-                                p.float_value ());
-          else if (iscomplex)
-            retval = xcolnorms (x.complex_matrix_value (),
-                                p.double_value ());
-          else
-            retval = xcolnorms (x.matrix_value (),
-                                p.double_value ());
-        }
+        retval = xcolnorms (x.sparse_matrix_value (),
+                            p.double_value ());
     }
   else
-    err_wrong_type_arg ("xcolnorms", x);
+    {
+      if (isfloat & iscomplex)
+        retval = xcolnorms (x.float_complex_matrix_value (),
+                            p.float_value ());
+      else if (isfloat)
+        retval = xcolnorms (x.float_matrix_value (),
+                            p.float_value ());
+      else if (iscomplex)
+        retval = xcolnorms (x.complex_matrix_value (),
+                            p.double_value ());
+      else
+        retval = xcolnorms (x.matrix_value (),
+                            p.double_value ());
+    }
 
   return retval;
 }
@@ -145,35 +141,33 @@
   bool issparse = x.is_sparse_type ();
   bool isfloat = x.is_single_type ();
 
-  if (isfloat || x.is_double_type ())
+  if (! isfloat && ! x.is_double_type ())
+    err_wrong_type_arg ("xrownorms", x);
+
+  if (issparse)
     {
-      if (issparse)
-        {
-          if (iscomplex)
-            retval = xrownorms (x.sparse_complex_matrix_value (),
-                                p.double_value ());
-          else
-            retval = xrownorms (x.sparse_matrix_value (),
-                                p.double_value ());
-        }
+      if (iscomplex)
+        retval = xrownorms (x.sparse_complex_matrix_value (),
+                            p.double_value ());
       else
-        {
-          if (isfloat & iscomplex)
-            retval = xrownorms (x.float_complex_matrix_value (),
-                                p.float_value ());
-          else if (isfloat)
-            retval = xrownorms (x.float_matrix_value (),
-                                p.float_value ());
-          else if (iscomplex)
-            retval = xrownorms (x.complex_matrix_value (),
-                                p.double_value ());
-          else
-            retval = xrownorms (x.matrix_value (),
-                                p.double_value ());
-        }
+        retval = xrownorms (x.sparse_matrix_value (),
+                            p.double_value ());
     }
   else
-    err_wrong_type_arg ("xrownorms", x);
+    {
+      if (isfloat & iscomplex)
+        retval = xrownorms (x.float_complex_matrix_value (),
+                            p.float_value ());
+      else if (isfloat)
+        retval = xrownorms (x.float_matrix_value (),
+                            p.float_value ());
+      else if (iscomplex)
+        retval = xrownorms (x.complex_matrix_value (),
+                            p.double_value ());
+      else
+        retval = xrownorms (x.matrix_value (),
+                            p.double_value ());
+    }
 
   return retval;
 }
@@ -186,29 +180,27 @@
   bool issparse = x.is_sparse_type ();
   bool isfloat = x.is_single_type ();
 
-  if (isfloat || x.is_double_type ())
+  if (! isfloat && ! x.is_double_type ())
+    err_wrong_type_arg ("xfrobnorm", x);
+
+  if (issparse)
     {
-      if (issparse)
-        {
-          if (iscomplex)
-            retval = xfrobnorm (x.sparse_complex_matrix_value ());
-          else
-            retval = xfrobnorm (x.sparse_matrix_value ());
-        }
+      if (iscomplex)
+        retval = xfrobnorm (x.sparse_complex_matrix_value ());
       else
-        {
-          if (isfloat & iscomplex)
-            retval = xfrobnorm (x.float_complex_matrix_value ());
-          else if (isfloat)
-            retval = xfrobnorm (x.float_matrix_value ());
-          else if (iscomplex)
-            retval = xfrobnorm (x.complex_matrix_value ());
-          else
-            retval = xfrobnorm (x.matrix_value ());
-        }
+        retval = xfrobnorm (x.sparse_matrix_value ());
     }
   else
-    err_wrong_type_arg ("xfrobnorm", x);
+    {
+      if (isfloat & iscomplex)
+        retval = xfrobnorm (x.float_complex_matrix_value ());
+      else if (isfloat)
+        retval = xfrobnorm (x.float_matrix_value ());
+      else if (iscomplex)
+        retval = xfrobnorm (x.complex_matrix_value ());
+      else
+        retval = xfrobnorm (x.matrix_value ());
+    }
 
   return retval;
 }