octave: libinterp/corefcn/__ilu_

annotate libinterp/corefcn/ilu.cc @ 23581:c3075ae020e1

maint: Deprecate is_complex_type and replace with iscomplex. * ov.h (is_complex_type): Use OCTAVE_DEPRECATED macro around function. * ov.h (iscomplex): New function. * __ichol__.cc, __ilu__.cc, balance.cc, bsxfun.cc, cellfun.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, det.cc, dot.cc, fft.cc, fft2.cc, fftn.cc, filter.cc, find.cc, givens.cc, graphics.cc, gsvd.cc, hess.cc, hex2num.cc, inv.cc, kron.cc, lookup.cc, ls-mat-ascii.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, matrix_type.cc, mex.cc, mgorth.cc, ordschur.cc, pinv.cc, psi.cc, quad.cc, qz.cc, rcond.cc, schur.cc, sparse-xpow.cc, sparse.cc, sqrtm.cc, svd.cc, sylvester.cc, symtab.cc, typecast.cc, variables.cc, xnorm.cc, __eigs__.cc, amd.cc, ccolamd.cc, chol.cc, colamd.cc, qr.cc, symbfact.cc, ov-base.h, ov-complex.h, ov-cx-diag.h, ov-cx-mat.h, ov-cx-sparse.h, ov-flt-complex.h, ov-flt-cx-diag.h, ov-flt-cx-mat.h, jit-typeinfo.cc, pt-tm-const.cc: Replace instances of is_complex_type with iscomplex.

author	Rik <rik@octave.org>
date	Mon, 12 Jun 2017 21:18:23 -0700
parents	c763214a8260
children	194eb4bd202b

rev	line source
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1 /*
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	2
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	3 Copyright (C) 2014-2017 Eduardo Ramos Fernández <eduradical951@gmail.com>
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	4 Copyright (C) 2013-2017 Kai T. Ohlhus <k.ohlhus@gmail.com>
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	5
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	6 This file is part of Octave.
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	7
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	8 Octave is free software; you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	9 under the terms of the GNU General Public License as published by
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	10 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	11 (at your option) any later version.
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	12
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	13 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	16 GNU General Public License for more details.
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	17
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	18 You should have received a copy of the GNU General Public License
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	19 along with Octave; see the file COPYING. If not, see
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	20 <http://www.gnu.org/licenses/>.
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	21
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	22 */
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	23
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21604 diff changeset	24 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	25 # include "config.h"
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	26 #endif
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	27
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 19241 diff changeset	28 #include "oct-locbuf.h"
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	29 #include "oct-norm.h"
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 19241 diff changeset	30
19877 12ecb7212b44 move some files without external dependencies from dldfcn to corefcn John W. Eaton <jwe@octave.org> parents: 19795 diff changeset	31 #include "defun.h"
12ecb7212b44 move some files without external dependencies from dldfcn to corefcn John W. Eaton <jwe@octave.org> parents: 19795 diff changeset	32 #include "error.h"
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	33
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	34 #include "builtin-defun-decls.h"
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	35
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	36 // This function implements the IKJ and JKI variants of Gaussian elimination to
21308 c53bfd6d8e08 maint: Use American spelling for "behavior". Rik <rik@octave.org> parents: 21301 diff changeset	37 // perform the ILUTP decomposition. The behavior is controlled by milu
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	38 // parameter. If milu = ['off'\|'col'] the JKI version is performed taking
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	39 // advantage of CCS format of the input matrix. If milu = 'row' the input
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	40 // matrix has to be transposed to obtain the equivalent CRS structure so we can
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	41 // work efficiently with rows. In this case IKJ version is used.
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	42 template <typename octave_matrix_t, typename T>
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	43 void ilu_0 (octave_matrix_t& sm, const std::string milu = "off")
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	44 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	45 const octave_idx_type n = sm.cols ();
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	46 octave_idx_type j1, j2, jrow, jw, i, j, k, jj;
21788 43f613cca3ab libinterp/corefcn/__ilu__.cc: avoid compiler warning (bug #48043) [-Wmaybe-uninitialized] Robert Jenssen <robertjenssen@ozemail.com.au> parents: 21724 diff changeset	47 T r;
43f613cca3ab libinterp/corefcn/__ilu__.cc: avoid compiler warning (bug #48043) [-Wmaybe-uninitialized] Robert Jenssen <robertjenssen@ozemail.com.au> parents: 21724 diff changeset	48 T tl = 0;
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	49
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	50 enum {OFF, ROW, COL};
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	51 char opt;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	52 if (milu == "row")
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	53 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	54 opt = ROW;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	55 sm = sm.transpose ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	56 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	57 else if (milu == "col")
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	58 opt = COL;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	59 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	60 opt = OFF;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	61
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	62 // Input matrix pointers
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	63 octave_idx_type *cidx = sm.cidx ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	64 octave_idx_type *ridx = sm.ridx ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	65 T *data = sm.data ();
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	66
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	67 // Working arrays
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	68 OCTAVE_LOCAL_BUFFER (octave_idx_type, iw, n);
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	69 OCTAVE_LOCAL_BUFFER (octave_idx_type, uptr, n);
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	70
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	71 // Initialize working arrays
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	72 for (i = 0; i < n; i++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	73 iw[i] = -1;
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	74
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	75 // Loop over all columns
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	76 for (k = 0; k < n; k++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	77 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	78 j1 = cidx[k];
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	79 j2 = cidx[k+1];
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	80
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	81 if (j1 == j2)
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	82 error ("ilu: A has a zero on the diagonal");
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	83
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	84 for (j = j1; j < j2; j++)
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	85 iw[ridx[j]] = j;
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	86
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	87 r = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	88 j = j1;
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	89 jrow = ridx[j1];
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	90 while ((jrow < k) && (j < j2))
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	91 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	92 if (opt == ROW)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	93 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	94 tl = data[j] / data[uptr[jrow]];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	95 data[j] = tl;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	96 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	97 for (jj = uptr[jrow] + 1; jj < cidx[jrow+1]; jj++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	98 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	99 jw = iw[ridx[jj]];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	100 if (jw != -1)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	101 if (opt == ROW)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	102 data[jw] -= tl * data[jj];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	103 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	104 data[jw] -= data[j] * data[jj];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	105
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	106 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	107 // That is for the milu='row'
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	108 if (opt == ROW)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	109 r += tl * data[jj];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	110 else if (opt == COL)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	111 r += data[j] * data[jj];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	112 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	113 j++;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	114 jrow = ridx[j];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	115 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	116 uptr[k] = j;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	117 if (opt != OFF)
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	118 data[uptr[k]] -= r;
20980 81c2b14c209f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20956 diff changeset	119
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	120 if (opt != ROW)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	121 for (jj = uptr[k] + 1; jj < cidx[k+1]; jj++)
21568 3d60ed163b70 maint: Eliminate bad spacing around '='. Rik <rik@octave.org> parents: 21419 diff changeset	122 data[jj] /= data[uptr[k]];
20980 81c2b14c209f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20956 diff changeset	123
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	124 if (k != jrow)
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20915 diff changeset	125 error ("ilu: A has a zero on the diagonal");
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	126
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	127 if (data[j] == T(0))
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20915 diff changeset	128 error ("ilu: encountered a pivot equal to 0");
20980 81c2b14c209f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20956 diff changeset	129
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	130 for (i = j1; i < j2; i++)
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	131 iw[ridx[i]] = -1;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	132 }
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	133
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	134 if (opt == ROW)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	135 sm = sm.transpose ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	136 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	137
20915 a3359fe50966 remove unused nargout variables John W. Eaton <jwe@octave.org> parents: 20909 diff changeset	138 DEFUN (__ilu0__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21788 diff changeset	139 doc: /* -- texinfo --
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	140 @deftypefn {} {[@var{L}, @var{U}] =} __ilu0__ (@var{A}, @var{milu})
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	141 @deftypefnx {} {[@var{L}, @var{U}, @var{P}] =} __ilu0__ (@var{A}, @var{milu})
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21788 diff changeset	142 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21788 diff changeset	143 @end deftypefn */)
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	144 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	145 if (args.length () != 2)
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	146 print_usage ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	147
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	148 octave_value_list retval (2);
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	149
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	150 std::string milu = args(1).string_value ();
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	151
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	152 // In ILU0 algorithm the zero-pattern of the input matrix is preserved so
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	153 // its structure does not change during the algorithm. The same input
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	154 // matrix is used to build the output matrix due to that fact.
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	155 octave_value_list arg_list;
23581 c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex. Rik <rik@octave.org> parents: 23449 diff changeset	156 if (! args(0).iscomplex ())
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	157 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	158 SparseMatrix sm = args(0).sparse_matrix_value ();
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	159 SparseMatrix speye (DiagMatrix (sm.cols (), sm.cols (), 1.0));
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	160
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	161 ilu_0 <SparseMatrix, double> (sm, milu);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	162
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	163 retval(0) = speye + Ftril (ovl (sm, -1))(0).sparse_matrix_value ();
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	164 retval(1) = Ftriu (ovl (sm))(0).sparse_matrix_value ();
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	165 }
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	166 else
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	167 {
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	168 SparseComplexMatrix sm = args(0).sparse_complex_matrix_value ();
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	169 SparseMatrix speye (DiagMatrix (sm.cols (), sm.cols (), 1.0));
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	170
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	171 ilu_0 <SparseComplexMatrix, Complex> (sm, milu);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	172
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	173 retval(0) = speye +
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	174 Ftril (ovl (sm, -1))(0).sparse_complex_matrix_value ();
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	175 retval(1) = Ftriu (ovl (sm))(0).sparse_complex_matrix_value ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	176 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	177
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	178 return retval;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	179 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	180
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	181 template <typename octave_matrix_t, typename T>
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	182 void ilu_crout (octave_matrix_t& sm_l, octave_matrix_t& sm_u,
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	183 octave_matrix_t& L, octave_matrix_t& U, T *cols_norm,
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	184 T *rows_norm, const T droptol = 0,
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	185 const std::string milu = "off")
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	186 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	187 // Map the strings into chars for faster comparing inside loops
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	188 char opt;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	189 enum {OFF, ROW, COL};
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	190 if (milu == "row")
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	191 opt = ROW;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	192 else if (milu == "col")
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	193 opt = COL;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	194 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	195 opt = OFF;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	196
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	197 octave_idx_type jrow, i, j, k, jj, total_len_l, total_len_u, max_len_u,
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	198 max_len_l, w_len_u, w_len_l, cols_list_len, rows_list_len;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	199
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	200 const octave_idx_type n = sm_u.cols ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	201 sm_u = sm_u.transpose ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	202
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	203 max_len_u = sm_u.nnz ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	204 max_len_u += (0.1 * max_len_u) > n ? 0.1 * max_len_u : n;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	205 max_len_l = sm_l.nnz ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	206 max_len_l += (0.1 * max_len_l) > n ? 0.1 * max_len_l : n;
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	207
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	208 // Extract pointers to the arrays for faster access inside loops
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	209 octave_idx_type *cidx_in_u = sm_u.cidx ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	210 octave_idx_type *ridx_in_u = sm_u.ridx ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	211 T *data_in_u = sm_u.data ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	212 octave_idx_type *cidx_in_l = sm_l.cidx ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	213 octave_idx_type *ridx_in_l = sm_l.ridx ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	214 T *data_in_l = sm_l.data ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	215
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	216 // L output arrays
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	217 Array <octave_idx_type> ridx_out_l (dim_vector (max_len_l, 1));
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	218 octave_idx_type *ridx_l = ridx_out_l.fortran_vec ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	219 Array <T> data_out_l (dim_vector (max_len_l, 1));
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	220 T *data_l = data_out_l.fortran_vec ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	221
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	222 // U output arrays
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	223 Array <octave_idx_type> ridx_out_u (dim_vector (max_len_u, 1));
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	224 octave_idx_type *ridx_u = ridx_out_u.fortran_vec ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	225 Array <T> data_out_u (dim_vector (max_len_u, 1));
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	226 T *data_u = data_out_u.fortran_vec ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	227
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	228 // Working arrays
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	229 OCTAVE_LOCAL_BUFFER (octave_idx_type, cidx_l, n + 1);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	230 OCTAVE_LOCAL_BUFFER (octave_idx_type, cidx_u, n + 1);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	231 OCTAVE_LOCAL_BUFFER (octave_idx_type, cols_list, n);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	232 OCTAVE_LOCAL_BUFFER (octave_idx_type, rows_list, n);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	233 OCTAVE_LOCAL_BUFFER (T, w_data_l, n);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	234 OCTAVE_LOCAL_BUFFER (T, w_data_u, n);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	235 OCTAVE_LOCAL_BUFFER (octave_idx_type, Ufirst, n);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	236 OCTAVE_LOCAL_BUFFER (octave_idx_type, Lfirst, n);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	237 OCTAVE_LOCAL_BUFFER (T, cr_sum, n);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	238
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	239 T zero = T (0);
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	240
21604 d7a268e68e69 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 21578 diff changeset	241 // Initialize working arrays
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	242 cidx_u[0] = cidx_in_u[0];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	243 cidx_l[0] = cidx_in_l[0];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	244 for (i = 0; i < n; i++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	245 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	246 w_data_u[i] = zero;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	247 w_data_l[i] = zero;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	248 cr_sum[i] = zero;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	249 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	250
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	251 total_len_u = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	252 total_len_l = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	253 cols_list_len = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	254 rows_list_len = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	255
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	256 // Loop over all columns
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	257 for (k = 0; k < n; k++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	258 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	259 // Load the working column and working row
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	260 for (i = cidx_in_l[k]; i < cidx_in_l[k+1]; i++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	261 w_data_l[ridx_in_l[i]] = data_in_l[i];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	262
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	263 for (i = cidx_in_u[k]; i < cidx_in_u[k+1]; i++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	264 w_data_u[ridx_in_u[i]] = data_in_u[i];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	265
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	266 // Update U working row
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	267 for (j = 0; j < rows_list_len; j++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	268 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	269 if ((Ufirst[rows_list[j]] != -1))
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	270 for (jj = Ufirst[rows_list[j]]; jj < cidx_u[rows_list[j]+1]; jj++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	271 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	272 jrow = ridx_u[jj];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	273 w_data_u[jrow] -= data_u[jj] * data_l[Lfirst[rows_list[j]]];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	274 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	275 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	276 // Update L working column
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	277 for (j = 0; j < cols_list_len; j++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	278 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	279 if (Lfirst[cols_list[j]] != -1)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	280 for (jj = Lfirst[cols_list[j]]; jj < cidx_l[cols_list[j]+1]; jj++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	281 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	282 jrow = ridx_l[jj];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	283 w_data_l[jrow] -= data_l[jj] * data_u[Ufirst[cols_list[j]]];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	284 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	285 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	286
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	287 if ((max_len_u - total_len_u) < n)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	288 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	289 max_len_u += (0.1 * max_len_u) > n ? 0.1 * max_len_u : n;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	290 data_out_u.resize (dim_vector (max_len_u, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	291 data_u = data_out_u.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	292 ridx_out_u.resize (dim_vector (max_len_u, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	293 ridx_u = ridx_out_u.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	294 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	295
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	296 if ((max_len_l - total_len_l) < n)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	297 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	298 max_len_l += (0.1 * max_len_l) > n ? 0.1 * max_len_l : n;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	299 data_out_l.resize (dim_vector (max_len_l, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	300 data_l = data_out_l.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	301 ridx_out_l.resize (dim_vector (max_len_l, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	302 ridx_l = ridx_out_l.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	303 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	304
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	305 // Expand the working row into the U output data structures
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	306 w_len_l = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	307 data_u[total_len_u] = w_data_u[k];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	308 ridx_u[total_len_u] = k;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	309 w_len_u = 1;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	310 for (i = k + 1; i < n; i++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	311 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	312 if (w_data_u[i] != zero)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	313 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	314 if (std::abs (w_data_u[i]) < (droptol * rows_norm[k]))
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	315 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	316 if (opt == ROW)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	317 cr_sum[k] += w_data_u[i];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	318 else if (opt == COL)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	319 cr_sum[i] += w_data_u[i];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	320 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	321 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	322 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	323 data_u[total_len_u + w_len_u] = w_data_u[i];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	324 ridx_u[total_len_u + w_len_u] = i;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	325 w_len_u++;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	326 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	327 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	328
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	329 // Expand the working column into the L output data structures
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	330 if (w_data_l[i] != zero)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	331 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	332 if (std::abs (w_data_l[i]) < (droptol * cols_norm[k]))
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	333 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	334 if (opt == COL)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	335 cr_sum[k] += w_data_l[i];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	336 else if (opt == ROW)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	337 cr_sum[i] += w_data_l[i];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	338 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	339 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	340 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	341 data_l[total_len_l + w_len_l] = w_data_l[i];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	342 ridx_l[total_len_l + w_len_l] = i;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	343 w_len_l++;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	344 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	345 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	346 w_data_u[i] = zero;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	347 w_data_l[i] = zero;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	348 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	349
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	350 // Compensate row and column sums --> milu option
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	351 if (opt == COL \|\| opt == ROW)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	352 data_u[total_len_u] += cr_sum[k];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	353
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	354 // Check if the pivot is zero
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	355 if (data_u[total_len_u] == zero)
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20915 diff changeset	356 error ("ilu: encountered a pivot equal to 0");
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	357
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	358 // Scale the elements in L by the pivot
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	359 for (i = total_len_l ; i < (total_len_l + w_len_l); i++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	360 data_l[i] /= data_u[total_len_u];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	361
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	362 total_len_u += w_len_u;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	363 total_len_l += w_len_l;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	364 // Check if there are too many elements to be indexed with
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	365 // octave_idx_type type due to fill-in during the process.
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	366 if (total_len_l < 0 \|\| total_len_u < 0)
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20915 diff changeset	367 error ("ilu: integer overflow. Too many fill-in elements in L or U");
21055 5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 20980 diff changeset	368
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	369 cidx_u[k+1] = cidx_u[k] - cidx_u[0] + w_len_u;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	370 cidx_l[k+1] = cidx_l[k] - cidx_l[0] + w_len_l;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	371
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	372 // The tricky part of the algorithm. The arrays pointing to the first
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	373 // working element of each column in the next iteration (Lfirst) or
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	374 // the first working element of each row (Ufirst) are updated. Also the
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	375 // arrays working as lists cols_list and rows_list are filled with
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	376 // indices pointing to Ufirst and Lfirst respectively.
21578 683a1beee538 maint: Use "FIXME:" for all code blocks needing further attention. Rik <rik@octave.org> parents: 21568 diff changeset	377 // FIXME: Maybe the -1 indicating in Ufirst and Lfirst, that no elements
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	378 // have to be considered in a certain column or row in next iteration,
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	379 // can be removed. It feels safer to me using such an indicator.
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	380 if (k < (n - 1))
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	381 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	382 if (w_len_u > 0)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	383 Ufirst[k] = cidx_u[k];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	384 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	385 Ufirst[k] = -1;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	386 if (w_len_l > 0)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	387 Lfirst[k] = cidx_l[k];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	388 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	389 Lfirst[k] = -1;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	390 cols_list_len = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	391 rows_list_len = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	392 for (i = 0; i <= k; i++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	393 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	394 if (Ufirst[i] != -1)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	395 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	396 jj = ridx_u[Ufirst[i]];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	397 if (jj < (k + 1))
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	398 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	399 if (Ufirst[i] < (cidx_u[i+1]))
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	400 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	401 Ufirst[i]++;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	402 if (Ufirst[i] == cidx_u[i+1])
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	403 Ufirst[i] = -1;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	404 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	405 jj = ridx_u[Ufirst[i]];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	406 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	407 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	408 if (jj == (k + 1))
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	409 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	410 cols_list[cols_list_len] = i;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	411 cols_list_len++;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	412 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	413 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	414
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	415 if (Lfirst[i] != -1)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	416 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	417 jj = ridx_l[Lfirst[i]];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	418 if (jj < (k + 1))
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	419 if (Lfirst[i] < (cidx_l[i+1]))
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	420 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	421 Lfirst[i]++;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	422 if (Lfirst[i] == cidx_l[i+1])
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	423 Lfirst[i] = -1;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	424 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	425 jj = ridx_l[Lfirst[i]];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	426 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	427 if (jj == (k + 1))
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	428 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	429 rows_list[rows_list_len] = i;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	430 rows_list_len++;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	431 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	432 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	433 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	434 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	435 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	436
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	437 // Build the output matrices
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	438 L = octave_matrix_t (n, n, total_len_l);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	439 U = octave_matrix_t (n, n, total_len_u);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	440
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	441 // FIXME: Can these loops be replaced by std::copy?
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	442 for (i = 0; i <= n; i++)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	443 L.cidx (i) = cidx_l[i];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	444
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	445 for (i = 0; i < total_len_l; i++)
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	446 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	447 L.ridx (i) = ridx_l[i];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	448 L.data (i) = data_l[i];
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	449 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	450
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	451 for (i = 0; i <= n; i++)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	452 U.cidx (i) = cidx_u[i];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	453
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	454 for (i = 0; i < total_len_u; i++)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	455 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	456 U.ridx (i) = ridx_u[i];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	457 U.data (i) = data_u[i];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	458 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	459
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	460 U = U.transpose ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	461 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	462
20915 a3359fe50966 remove unused nargout variables John W. Eaton <jwe@octave.org> parents: 20909 diff changeset	463 DEFUN (__iluc__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21788 diff changeset	464 doc: /* -- texinfo --
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	465 @deftypefn {} {[@var{L}, @var{U}] =} __iluc__ (@var{A}, @var{droptol}, @var{milu})
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21788 diff changeset	466 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21788 diff changeset	467 @end deftypefn */)
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	468 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	469 if (args.length () != 3)
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	470 print_usage ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	471
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	472 double droptol = args(1).double_value ();
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	473 std::string milu = args(2).string_value ();
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	474
23581 c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex. Rik <rik@octave.org> parents: 23449 diff changeset	475 if (! args(0).iscomplex ())
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	476 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	477 SparseMatrix sm = args(0).sparse_matrix_value ();
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	478 SparseMatrix sm_u = Ftriu (ovl (sm))(0).sparse_matrix_value ();
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	479 SparseMatrix sm_l = Ftril (ovl (sm, -1))(0).sparse_matrix_value ();
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	480 SparseMatrix U, L;
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	481
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	482 ilu_crout <SparseMatrix, double> (sm_l, sm_u, L, U,
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	483 xcolnorms (sm).fortran_vec (),
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	484 xrownorms (sm).fortran_vec (),
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	485 droptol, milu);
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	486
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	487 SparseMatrix speye (DiagMatrix (L.cols (), L.cols (), 1.0));
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	488
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	489 return ovl (L + speye, U);
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	490 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	491 else
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	492 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	493 SparseComplexMatrix sm = args(0).sparse_complex_matrix_value ();
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	494 SparseComplexMatrix sm_u = Ftriu (ovl (sm))(0).sparse_complex_matrix_value ();
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	495 SparseComplexMatrix sm_l = Ftril (ovl (sm, -1))(0).sparse_complex_matrix_value ();
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	496 SparseComplexMatrix U, L;
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	497 Array<Complex> cols_norm = xcolnorms (sm);
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	498 Array<Complex> rows_norm = xrownorms (sm);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	499
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	500 ilu_crout <SparseComplexMatrix, Complex> (sm_l, sm_u, L, U,
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	501 cols_norm.fortran_vec (),
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	502 rows_norm.fortran_vec (),
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	503 Complex (droptol), milu);
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	504
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	505 SparseMatrix speye (DiagMatrix (L.cols (), L.cols (), 1.0));
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	506
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	507 return ovl (L + speye, U);
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	508 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	509 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	510
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	511 // This function implements the IKJ and JKI variants of gaussian elimination
21308 c53bfd6d8e08 maint: Use American spelling for "behavior". Rik <rik@octave.org> parents: 21301 diff changeset	512 // to perform the ILUTP decomposition. The behavior is controlled by milu
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	513 // parameter. If milu = ['off'\|'col'] the JKI version is performed taking
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	514 // advantage of CCS format of the input matrix. Row pivoting is performed.
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	515 // If milu = 'row' the input matrix has to be transposed to obtain the
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	516 // equivalent CRS structure so we can work efficiently with rows. In that
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	517 // case IKJ version is used and column pivoting is performed.
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	518
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	519 template <typename octave_matrix_t, typename T>
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	520 void ilu_tp (octave_matrix_t& sm, octave_matrix_t& L, octave_matrix_t& U,
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	521 octave_idx_type nnz_u, octave_idx_type nnz_l, T *cols_norm,
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	522 Array <octave_idx_type>& perm_vec, const T droptol = T(0),
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	523 const T thresh = T(0), const std::string milu = "off",
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	524 const double udiag = 0)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	525 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	526 char opt;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	527 enum {OFF, ROW, COL};
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	528 if (milu == "row")
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	529 opt = ROW;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	530 else if (milu == "col")
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	531 opt = COL;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	532 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	533 opt = OFF;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	534
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	535 const octave_idx_type n = sm.cols ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	536
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	537 // This is necessary for the JKI (milu = "row") variant.
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	538 if (opt == ROW)
20514 71e60880105a maint: Use Octave coding convention for parenthesis in __ilu__.cc. Rik <rik@octave.org> parents: 20172 diff changeset	539 sm = sm.transpose ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	540
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	541 // Extract pointers to the arrays for faster access inside loops
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	542 octave_idx_type *cidx_in = sm.cidx ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	543 octave_idx_type *ridx_in = sm.ridx ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	544 T *data_in = sm.data ();
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	545 octave_idx_type jrow, i, j, k, jj, c, total_len_l, total_len_u, p_perm,
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	546 max_ind, max_len_l, max_len_u;
19781 8bc45a00c8d6 avoid warnings about uninitialized variables John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	547 T zero = T(0);
8bc45a00c8d6 avoid warnings about uninitialized variables John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	548
8bc45a00c8d6 avoid warnings about uninitialized variables John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	549 T tl = zero, aux, maximum;
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	550
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	551 max_len_u = nnz_u;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	552 max_len_u += (0.1 * max_len_u) > n ? 0.1 * max_len_u : n;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	553 max_len_l = nnz_l;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	554 max_len_l += (0.1 * max_len_l) > n ? 0.1 * max_len_l : n;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	555
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	556 // Extract pointers to the arrays for faster access inside loops
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	557 Array <octave_idx_type> cidx_out_l (dim_vector (n + 1, 1));
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	558 octave_idx_type *cidx_l = cidx_out_l.fortran_vec ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	559 Array <octave_idx_type> ridx_out_l (dim_vector (max_len_l, 1));
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	560 octave_idx_type *ridx_l = ridx_out_l.fortran_vec ();
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	561 Array <T> data_out_l (dim_vector (max_len_l, 1));
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	562 T *data_l = data_out_l.fortran_vec ();
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	563
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	564 // Data for U
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	565 Array <octave_idx_type> cidx_out_u (dim_vector (n + 1, 1));
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	566 octave_idx_type *cidx_u = cidx_out_u.fortran_vec ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	567 Array <octave_idx_type> ridx_out_u (dim_vector (max_len_u, 1));
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	568 octave_idx_type *ridx_u = ridx_out_u.fortran_vec ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	569 Array <T> data_out_u (dim_vector (max_len_u, 1));
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	570 T *data_u = data_out_u.fortran_vec ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	571
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	572 // Working arrays and permutation arrays
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	573 octave_idx_type w_len_u, w_len_l;
19781 8bc45a00c8d6 avoid warnings about uninitialized variables John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	574 T total_sum, partial_col_sum = zero, partial_row_sum = zero;
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	575 std::set <octave_idx_type> iw_l;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	576 std::set <octave_idx_type> iw_u;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	577 std::set <octave_idx_type>::iterator it, it2;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	578 OCTAVE_LOCAL_BUFFER (T, w_data, n);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	579 OCTAVE_LOCAL_BUFFER (octave_idx_type, iperm, n);
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	580 octave_idx_type *perm = perm_vec.fortran_vec ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	581 OCTAVE_LOCAL_BUFFER (octave_idx_type, uptr, n);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	582
21604 d7a268e68e69 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 21578 diff changeset	583 // Initialize working and permutation arrays
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	584 cidx_l[0] = cidx_in[0];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	585 cidx_u[0] = cidx_in[0];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	586 for (i = 0; i < n; i++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	587 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	588 w_data[i] = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	589 perm[i] = i;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	590 iperm[i] = i;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	591 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	592 total_len_u = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	593 total_len_l = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	594
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	595 // Loop over all columns
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	596 for (k = 0; k < n; k++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	597 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	598 for (j = cidx_in[k]; j < cidx_in[k+1]; j++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	599 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	600 p_perm = iperm[ridx_in[j]];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	601 w_data[iperm[ridx_in[j]]] = data_in[j];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	602 if (p_perm > k)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	603 iw_l.insert (ridx_in[j]);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	604 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	605 iw_u.insert (p_perm);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	606 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	607
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	608 it = iw_u.begin ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	609 jrow = *it;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	610 total_sum = zero;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	611 while ((jrow < k) && (it != iw_u.end ()))
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	612 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	613 if (opt == COL)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	614 partial_col_sum = w_data[jrow];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	615 if (w_data[jrow] != zero)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	616 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	617 if (opt == ROW)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	618 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	619 partial_row_sum = w_data[jrow];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	620 tl = w_data[jrow] / data_u[uptr[jrow]];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	621 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	622 for (jj = cidx_l[jrow]; jj < cidx_l[jrow+1]; jj++)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	623 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	624 p_perm = iperm[ridx_l[jj]];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	625 aux = w_data[p_perm];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	626 if (opt == ROW)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	627 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	628 w_data[p_perm] -= tl * data_l[jj];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	629 partial_row_sum += tl * data_l[jj];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	630 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	631 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	632 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	633 tl = data_l[jj] * w_data[jrow];
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	634 w_data[p_perm] -= tl;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	635 if (opt == COL)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	636 partial_col_sum += tl;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	637 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	638
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	639 if ((aux == zero) && (w_data[p_perm] != zero))
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	640 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	641 if (p_perm > k)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	642 iw_l.insert (ridx_l[jj]);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	643 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	644 iw_u.insert (p_perm);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	645 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	646 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	647
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	648 // Drop element from the U part in IKJ
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	649 // and L part in JKI variant (milu = [col\|off])
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	650 if ((std::abs (w_data[jrow]) < (droptol * cols_norm[k]))
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	651 && (w_data[jrow] != zero))
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	652 {
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	653 if (opt == COL)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	654 total_sum += partial_col_sum;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	655 else if (opt == ROW)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	656 total_sum += partial_row_sum;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	657 w_data[jrow] = zero;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	658 it2 = it;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	659 it++;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	660 iw_u.erase (it2);
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	661 jrow = *it;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	662 continue;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	663 }
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	664 else
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	665 // This is the element scaled by the pivot
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	666 // in the actual iteration
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	667 if (opt == ROW)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	668 w_data[jrow] = tl;
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	669 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	670 jrow = *(++it);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	671 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	672
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	673 // Search for the pivot and update iw_l and iw_u if the pivot is not the
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	674 // diagonal element
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	675 if ((thresh > zero) && (k < (n - 1)))
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	676 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	677 maximum = std::abs (w_data[k]) / thresh;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	678 max_ind = perm[k];
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	679 for (it = iw_l.begin (); it != iw_l.end (); ++it)
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	680 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	681 p_perm = iperm[*it];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	682 if (std::abs (w_data[p_perm]) > maximum)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	683 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	684 maximum = std::abs (w_data[p_perm]);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	685 max_ind = *it;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	686 it2 = it;
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	687 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	688 }
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	689 // If the pivot is not the diagonal element update all
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	690 p_perm = iperm[max_ind];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	691 if (max_ind != perm[k])
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	692 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	693 iw_l.erase (it2);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	694 if (w_data[k] != zero)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	695 iw_l.insert (perm[k]);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	696 else
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	697 iw_u.insert (k);
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	698 // Swap data and update permutation vectors
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	699 aux = w_data[k];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	700 iperm[perm[p_perm]] = k;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	701 iperm[perm[k]] = p_perm;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	702 c = perm[k];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	703 perm[k] = perm[p_perm];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	704 perm[p_perm] = c;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	705 w_data[k] = w_data[p_perm];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	706 w_data[p_perm] = aux;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	707 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	708
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	709 }
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	710
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	711 // Drop elements in the L part in the IKJ version,
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	712 // and from the U part in the JKI version.
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	713 it = iw_l.begin ();
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	714 while (it != iw_l.end ())
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	715 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	716 p_perm = iperm[*it];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	717 if (droptol > zero)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	718 if (std::abs (w_data[p_perm]) < (droptol * cols_norm[k]))
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	719 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	720 if (opt != OFF)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	721 total_sum += w_data[p_perm];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	722 w_data[p_perm] = zero;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	723 it2 = it;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	724 it++;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	725 iw_l.erase (it2);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	726 continue;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	727 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	728
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	729 it++;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	730 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	731
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	732 // If milu == [row\|col] summation is preserved.
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	733 // Compensate diagonal element.
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	734 if (opt != OFF)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	735 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	736 if ((total_sum > zero) && (w_data[k] == zero))
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	737 iw_u.insert (k);
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	738 w_data[k] += total_sum;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	739 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	740
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	741 // Check if the pivot is zero and if udiag is active.
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	742 // NOTE: If the pivot == 0 and udiag is active, then if milu = [col\|row]
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	743 // will not preserve the row sum for that column/row.
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	744 if (w_data[k] == zero)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	745 {
20980 81c2b14c209f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20956 diff changeset	746 if (udiag != 1)
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20915 diff changeset	747 error ("ilu: encountered a pivot equal to 0");
20980 81c2b14c209f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20956 diff changeset	748
81c2b14c209f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20956 diff changeset	749 w_data[k] = droptol;
81c2b14c209f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20956 diff changeset	750 iw_u.insert (k);
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	751 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	752
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	753 // Scale the elements on the L part for IKJ version (milu = [col\|off])
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	754 if (opt != ROW)
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	755 for (it = iw_l.begin (); it != iw_l.end (); ++it)
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	756 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	757 p_perm = iperm[*it];
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	758 w_data[p_perm] = w_data[p_perm] / w_data[k];
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	759 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	760
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	761 if ((max_len_u - total_len_u) < n)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	762 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	763 max_len_u += (0.1 * max_len_u) > n ? 0.1 * max_len_u : n;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	764 data_out_u.resize (dim_vector (max_len_u, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	765 data_u = data_out_u.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	766 ridx_out_u.resize (dim_vector (max_len_u, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	767 ridx_u = ridx_out_u.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	768 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	769
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	770 if ((max_len_l - total_len_l) < n)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	771 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	772 max_len_l += (0.1 * max_len_l) > n ? 0.1 * max_len_l : n;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	773 data_out_l.resize (dim_vector (max_len_l, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	774 data_l = data_out_l.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	775 ridx_out_l.resize (dim_vector (max_len_l, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	776 ridx_l = ridx_out_l.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	777 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	778
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	779 // Expand working vector into U.
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	780 w_len_u = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	781 for (it = iw_u.begin (); it != iw_u.end (); ++it)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	782 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	783 if (w_data[*it] != zero)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	784 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	785 data_u[total_len_u + w_len_u] = w_data[*it];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	786 ridx_u[total_len_u + w_len_u] = *it;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	787 w_len_u++;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	788 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	789 w_data[*it] = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	790 }
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	791
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	792 // Expand working vector into L.
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	793 w_len_l = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	794 for (it = iw_l.begin (); it != iw_l.end (); ++it)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	795 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	796 p_perm = iperm[*it];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	797 if (w_data[p_perm] != zero)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	798 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	799 data_l[total_len_l + w_len_l] = w_data[p_perm];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	800 ridx_l[total_len_l + w_len_l] = *it;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	801 w_len_l++;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	802 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	803 w_data[p_perm] = 0;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	804 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	805 total_len_u += w_len_u;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	806 total_len_l += w_len_l;
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	807
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	808 // Check if there are too many elements to be indexed with
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	809 // octave_idx_type type due to fill-in during the process.
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	810 if (total_len_l < 0 \|\| total_len_u < 0)
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20915 diff changeset	811 error ("ilu: Integer overflow. Too many fill-in elements in L or U");
20980 81c2b14c209f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20956 diff changeset	812
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	813 if (opt == ROW)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	814 uptr[k] = total_len_u - 1;
20980 81c2b14c209f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20956 diff changeset	815
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	816 cidx_u[k+1] = cidx_u[k] - cidx_u[0] + w_len_u;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	817 cidx_l[k+1] = cidx_l[k] - cidx_l[0] + w_len_l;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	818
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	819 iw_l.clear ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	820 iw_u.clear ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	821 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	822
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	823 octave_matrix_t *L_ptr;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	824 octave_matrix_t *U_ptr;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	825 octave_matrix_t diag (n, n, n);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	826
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	827 // L and U are interchanged if milu = 'row'. It is a matter
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	828 // of nomenclature to re-use code with both IKJ and JKI
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	829 // versions of the algorithm.
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	830 if (opt == ROW)
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	831 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	832 L_ptr = &U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	833 U_ptr = &L;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	834 L = octave_matrix_t (n, n, total_len_u - n);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	835 U = octave_matrix_t (n, n, total_len_l);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	836 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	837 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	838 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	839 L_ptr = &L;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	840 U_ptr = &U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	841 L = octave_matrix_t (n, n, total_len_l);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	842 U = octave_matrix_t (n, n, total_len_u);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	843 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	844
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	845 for (i = 0; i <= n; i++)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	846 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	847 L_ptr->cidx (i) = cidx_l[i];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	848 U_ptr->cidx (i) = cidx_u[i];
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	849 if (opt == ROW)
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	850 U_ptr->cidx (i) -= i;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	851 }
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	852
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	853 for (i = 0; i < n; i++)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	854 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	855 if (opt == ROW)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	856 diag.elem (i,i) = data_u[uptr[i]];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	857 j = cidx_l[i];
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	858
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	859 while (j < cidx_l[i+1])
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	860 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	861 L_ptr->ridx (j) = ridx_l[j];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	862 L_ptr->data (j) = data_l[j];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	863 j++;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	864 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	865 j = cidx_u[i];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	866
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	867 while (j < cidx_u[i+1])
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	868 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	869 c = j;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	870 if (opt == ROW)
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	871 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	872 // The diagonal is removed from L if milu = 'row'.
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	873 // That is because is convenient to have it inside
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	874 // the L part to carry out the process.
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	875 if (ridx_u[j] == i)
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	876 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	877 j++;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	878 continue;
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	879 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	880 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	881 c -= i;
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	882 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	883 U_ptr->data (c) = data_u[j];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	884 U_ptr->ridx (c) = ridx_u[j];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	885 j++;
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	886 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	887 }
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	888
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	889 if (opt == ROW)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	890 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	891 U = U.transpose ();
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	892 // The diagonal, conveniently permuted is added to U
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	893 U += diag.index (idx_vector::colon, perm_vec);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	894 L = L.transpose ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	895 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	896 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	897
19877 12ecb7212b44 move some files without external dependencies from dldfcn to corefcn John W. Eaton <jwe@octave.org> parents: 19795 diff changeset	898 DEFUN (__ilutp__, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21788 diff changeset	899 doc: /* -- texinfo --
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	900 @deftypefn {} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh}, @var{milu}, @var{udiag})
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	901 @deftypefnx {} {[@var{L}, @var{U}, @var{P}] =} __ilutp__ (@dots{})
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21788 diff changeset	902 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21788 diff changeset	903 @end deftypefn */)
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	904 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	905 if (args.length () != 5)
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	906 print_usage ();
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	907
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	908 octave_value_list retval;
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	909 double droptol = args(1).double_value ();
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	910 double thresh = args(2).double_value ();
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	911 std::string milu = args(3).string_value ();
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	912 double udiag = args(4).double_value ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	913
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	914 octave_value_list arg_list;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	915 octave_idx_type nnz_u, nnz_l;
23581 c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex. Rik <rik@octave.org> parents: 23449 diff changeset	916 if (! args(0).iscomplex ())
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	917 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	918 SparseMatrix sm = args(0).sparse_matrix_value ();
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	919 SparseMatrix U, L;
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	920 nnz_u = (Ftriu (ovl (sm))(0).sparse_matrix_value ()).nnz ();
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	921 nnz_l = (Ftril (ovl (sm, -1))(0).sparse_matrix_value ()).nnz ();
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	922 Array <double> rc_norm;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	923 if (milu == "row")
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	924 rc_norm = xrownorms (sm);
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	925 else
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	926 rc_norm = xcolnorms (sm);
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	927 Array <octave_idx_type> perm (dim_vector (sm.cols (), 1));
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	928
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	929 ilu_tp <SparseMatrix, double> (sm, L, U, nnz_u, nnz_l,
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	930 rc_norm.fortran_vec (),
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	931 perm, droptol, thresh, milu, udiag);
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	932
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	933 SparseMatrix speye (DiagMatrix (L.cols (), L.cols (), 1.0));
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	934 if (milu == "row")
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	935 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	936 retval(0) = L + speye;
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	937 if (nargout == 3)
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	938 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	939 retval(1) = U.index (idx_vector::colon, perm);
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	940 retval(2) = speye.index (idx_vector::colon, perm);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	941 }
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	942 else
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	943 retval(1) = U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	944 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	945 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	946 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	947 retval(1) = U;
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	948 if (nargout == 3)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	949 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	950 retval(0) = L.index (perm, idx_vector::colon) + speye;
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	951 retval(2) = speye.index (perm, idx_vector::colon);
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	952 }
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	953 else
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	954 retval(0) = L + speye.index (perm, idx_vector::colon);
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	955 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	956 }
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	957 else
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	958 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	959 SparseComplexMatrix sm = args(0).sparse_complex_matrix_value ();
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	960 SparseComplexMatrix U, L;
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	961 nnz_u = (Ftriu (ovl (sm))(0).sparse_complex_matrix_value ()).nnz ();
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	962 nnz_l = (Ftril (ovl (sm, -1))(0).sparse_complex_matrix_value ()).nnz ();
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	963 Array <Complex> rc_norm;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	964 if (milu == "row")
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	965 rc_norm = xrownorms (sm);
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	966 else
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	967 rc_norm = xcolnorms (sm);
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	968 Array <octave_idx_type> perm (dim_vector (sm.cols (), 1));
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	969
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	970 ilu_tp <SparseComplexMatrix, Complex>
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	971 (sm, L, U, nnz_u, nnz_l, rc_norm.fortran_vec (), perm,
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	972 Complex (droptol), Complex (thresh), milu, udiag);
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	973
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	974 SparseMatrix speye (DiagMatrix (L.cols (), L.cols (), 1.0));
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	975 if (milu == "row")
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	976 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	977 retval(0) = L + speye;
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	978 if (nargout == 3)
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	979 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	980 retval(1) = U.index (idx_vector::colon, perm);
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	981 retval(2) = speye.index (idx_vector::colon, perm);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	982 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	983 else if (nargout == 2)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	984 retval(1) = U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	985 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	986 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	987 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	988 retval(1) = U;
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	989 if (nargout == 3)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	990 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	991 retval(0) = L.index (perm, idx_vector::colon) + speye;
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	992 retval(2) = speye.index (perm, idx_vector::colon);
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	993 }
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	994 else
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	995 retval(0) = L + speye.index (perm, idx_vector::colon);
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	996 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	997 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	998
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	999 return retval;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1000 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1001
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1002 /*
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1003 ## No test needed for internal helper function.
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1004 %!assert (1)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1005 */

Mercurial > octave

annotate libinterp/corefcn/__ilu__.cc @ 23581:c3075ae020e1

annotate libinterp/corefcn/ilu.cc @ 23581:c3075ae020e1