Mercurial > octave

comparison libinterp/dldfcn/ccolamd.cc @ 21055:5e00ed38a58b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Replace if/error/else paradigm with just if/error. * __ilu__.cc, data.cc, file-io.cc, graphics.cc, graphics.in.h, ls-mat5.cc, lu.cc, octave-link.cc, regexp.cc, schur.cc, spparms.cc, sub2ind.cc, syscalls.cc, toplev.cc, variables.cc, xpow.cc, audiodevinfo.cc, ccolamd.cc, ov-builtin.cc, ov-classdef.cc, ov-intx.h, ov-lazy-idx.cc, ov-mex-fcn.cc, op-int.h, lex.ll, oct-parse.in.yy, pt-binop.cc, pt-cbinop.cc, pt-const.cc, pt-decl.h, pt-fcn-handle.cc, pt-unop.cc, CollocWt.cc: Replace if/error/else paradigm with just if/error.
author Rik <rik@octave.org>
date Wed, 13 Jan 2016 11:02:22 -0800
parents 77f5591878bf
children bd1752782e56
comparison
equal deleted inserted replaced
21054:221847e5f488 21055:5e00ed38a58b
278 // convert cmember from 1-based to 0-based 278 // convert cmember from 1-based to 0-based
279 cmember[i] = static_cast<octave_idx_type>(in_cmember(i) - 1); 279 cmember[i] = static_cast<octave_idx_type>(in_cmember(i) - 1);
280 280
281 if (cslen != n_col) 281 if (cslen != n_col)
282 error ("ccolamd: CMEMBER must be of length equal to #cols of A"); 282 error ("ccolamd: CMEMBER must be of length equal to #cols of A");
283 else 283
284 // Order the columns (destroys A) 284 // Order the columns (destroys A)
285 if (! CCOLAMD_NAME () (n_row, n_col, Alen, A, p, 285 if (! CCOLAMD_NAME () (n_row, n_col, Alen, A, p, knobs, stats, cmember))
286 knobs, stats, cmember)) 286 {
287 { 287 CCOLAMD_NAME (_report) (stats) ;
288 CCOLAMD_NAME (_report) (stats) ; 288
289 289 error ("ccolamd: internal error!");
290 error ("ccolamd: internal error!"); 290 }
291 }
292 } 291 }
293 else 292 else
294 { 293 {
295 // Order the columns (destroys A) 294 // Order the columns (destroys A)
296 if (! CCOLAMD_NAME () (n_row, n_col, Alen, A, p, knobs, stats, 0)) 295 if (! CCOLAMD_NAME () (n_row, n_col, Alen, A, p, knobs, stats, 0))
511 // convert cmember from 1-based to 0-based 510 // convert cmember from 1-based to 0-based
512 cmember[i] = static_cast<octave_idx_type>(in_cmember(i) - 1); 511 cmember[i] = static_cast<octave_idx_type>(in_cmember(i) - 1);
513 512
514 if (cslen != n_col) 513 if (cslen != n_col)
515 error ("csymamd: CMEMBER must be of length equal to #cols of A"); 514 error ("csymamd: CMEMBER must be of length equal to #cols of A");
516 else if (! CSYMAMD_NAME () (n_col, ridx, cidx, perm, knobs, stats, 515
517 &calloc, &free, cmember, -1)) 516 if (! CSYMAMD_NAME () (n_col, ridx, cidx, perm, knobs, stats,
517 &calloc, &free, cmember, -1))
518 { 518 {
519 CSYMAMD_NAME (_report) (stats) ; 519 CSYMAMD_NAME (_report) (stats) ;
520 520
521 error ("csymamd: internal error!") ; 521 error ("csymamd: internal error!") ;
522 } 522 }