diff libinterp/dldfcn/colamd.cc @ 20939:b17fda023ca6

maint: Use new C++ archetype in more files. Place input validation first in files. Move declaration of retval down in function to be closer to point of usage. Eliminate else clause after if () error. Use "return ovl()" where it makes sense. * find.cc, gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, givens.cc, graphics.cc, help.cc, hess.cc, hex2num.cc, input.cc, kron.cc, load-path.cc, load-save.cc, lookup.cc, mappers.cc, matrix_type.cc, mgorth.cc, nproc.cc, ordschur.cc, pager.cc, pinv.cc, pr-output.cc, profiler.cc, psi.cc, quad.cc, rcond.cc, regexp.cc, schur.cc, sighandlers.cc, sparse.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc, __delaunayn__.cc, __eigs__.cc, __glpk__.cc, __magick_read__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc, audiodevinfo.cc, audioread.cc, chol.cc, colamd.cc, dmperm.cc, fftw.cc, qr.cc, symbfact.cc, symrcm.cc, ov-bool-mat.cc, ov-cell.cc, ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-flt-re-mat.cc, ov-java.cc, ov-null-mat.cc, ov-oncleanup.cc, ov-re-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-usr-fcn.cc, ov.cc, octave.cc: Use new C++ archetype in more files.
author Rik <rik@octave.org>
date Fri, 18 Dec 2015 15:37:22 -0800
parents 03e4ddd49396
children 6eff66fb8a02
line wrap: on
line diff
--- a/libinterp/dldfcn/colamd.cc	Fri Dec 18 16:22:53 2015 -0500
+++ b/libinterp/dldfcn/colamd.cc	Fri Dec 18 15:37:22 2015 -0800
@@ -668,29 +668,26 @@
   octave_idx_type *cidx = 0;
 
   if (args(0).is_sparse_type ())
-    {
-      if (args(0).is_complex_type ())
-        {
-          SparseComplexMatrix scm = args(0).sparse_complex_matrix_value ();
+    error ("etree: S must be a sparse matrix");
 
-          n_row = scm.rows ();
-          n_col = scm.cols ();
-          ridx = scm.xridx ();
-          cidx = scm.xcidx ();
-        }
-      else
-        {
-          SparseMatrix sm = args(0).sparse_matrix_value ();
+  if (args(0).is_complex_type ())
+    {
+      SparseComplexMatrix scm = args(0).sparse_complex_matrix_value ();
 
-          n_row = sm.rows ();
-          n_col = sm.cols ();
-          ridx = sm.xridx ();
-          cidx = sm.xcidx ();
-        }
-
+      n_row = scm.rows ();
+      n_col = scm.cols ();
+      ridx = scm.xridx ();
+      cidx = scm.xcidx ();
     }
   else
-    error ("etree: S must be a sparse matrix");
+    {
+      SparseMatrix sm = args(0).sparse_matrix_value ();
+
+      n_row = sm.rows ();
+      n_col = sm.cols ();
+      ridx = sm.xridx ();
+      cidx = sm.xcidx ();
+    }
 
   bool is_sym = true;