octave: libinterp/corefcn/__ilu_

annotate libinterp/corefcn/ilu.cc @ 33527:d10bed2b2cb4 bytecode-interpreter tip

maint: Merge default to bytecode interpreter.

author	Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
date	Fri, 03 May 2024 02:01:58 -0400
parents	f53ac65ffba6
children

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
32632 2e484f9f1f18 maint: update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 32589 diff changeset	3 // Copyright (C) 2013-2024 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
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	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21604 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	27 # 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	28 #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	29
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 19241 diff changeset	30 #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	31 #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	32
19877 12ecb7212b44 move some files without external dependencies from dldfcn to corefcn John W. Eaton <jwe@octave.org> parents: 19795 diff changeset	33 #include "defun.h"
12ecb7212b44 move some files without external dependencies from dldfcn to corefcn John W. Eaton <jwe@octave.org> parents: 19795 diff changeset	34 #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	35
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	36 #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	37
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 31189 diff changeset	38 OCTAVE_BEGIN_NAMESPACE(octave)
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29874 diff changeset	39
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	40 // This function implements the IKJ and JKI variants of Gaussian elimination to
25028 acb7094aebb3 Fix ilu when type is ilutp and two output arguments are required (#53440). Marco Caliari <marco.caliari@univr.it> parents: 24534 diff changeset	41 // perform the ILU0 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	42 // 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	43 // 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	44 // 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	45 // 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	46 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	47 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	48 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	50 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	51 T r;
43f613cca3ab libinterp/corefcn/__ilu__.cc: avoid compiler warning (bug #48043) [-Wmaybe-uninitialized] Robert Jenssen <robertjenssen@ozemail.com.au> parents: 21724 diff changeset	52 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	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 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	55 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	56 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	57 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 = 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	59 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	60 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	62 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	63 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	64 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	65
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	66 // Input matrix pointers
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	67 octave_idx_type *cidx = sm.cidx ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	68 octave_idx_type *ridx = sm.ridx ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	69 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	70
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	71 // Working arrays
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	72 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	73 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	74
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	75 // 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	76 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	77 iw[i] = -1;
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	78
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	79 // 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	80 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	81 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	82 j1 = cidx[k];
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	83 j2 = cidx[k+1];
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	84
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	85 if (j1 == j2)
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	86 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	87
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	88 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	89 iw[ridx[j]] = j;
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	90
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 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	92 j = j1;
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	93 jrow = ridx[j1];
13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	94 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	95 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	97 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	99 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	100 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	102 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	104 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	105 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	106 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	107 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	108 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	109
df64071e538c Removed ichol0.cc, icholt.cc, 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
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	112 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	113 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	114 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	115 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	116 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	117 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	118 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	119 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 uptr[k] = j;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	121 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	122 data[uptr[k]] -= r;
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 (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	125 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	126 data[jj] /= data[uptr[k]];
20980 81c2b14c209f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20956 diff changeset	127
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	128 if (k != jrow)
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20915 diff changeset	129 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	130
df64071e538c Removed ichol0.cc, icholt.cc, 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 if (data[j] == T(0))
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20915 diff changeset	132 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	133
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	134 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	135 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	136 }
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	137
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	138 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	139 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	140 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	141
20915 a3359fe50966 remove unused nargout variables John W. Eaton <jwe@octave.org> parents: 20909 diff changeset	142 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	143 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	144 @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	145 @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	146 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	147 @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	148 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	149 if (args.length () != 2)
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	150 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	151
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	152 octave_value_list retval (2);
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	153
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	154 std::string milu = args(1).string_value ();
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	155
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	156 // 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	157 // 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	158 // 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	159 octave_value_list arg_list;
23581 c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex. Rik <rik@octave.org> parents: 23449 diff changeset	160 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	161 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	162 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	163 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	164
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	165 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	166
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	167 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	168 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	169 }
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	170 else
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	171 {
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	172 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	173 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	174
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	175 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	176
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	177 retval(0) = speye +
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	178 Ftril (ovl (sm, -1))(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	179 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	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
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	183 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	184
df64071e538c Removed ichol0.cc, icholt.cc, 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 template <typename octave_matrix_t, typename T>
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 31706 diff changeset	186 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 31706 diff changeset	187 ilu_crout (octave_matrix_t& sm_l, octave_matrix_t& sm_u,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 31706 diff changeset	188 octave_matrix_t& L, octave_matrix_t& U, T *cols_norm,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 31706 diff changeset	189 T *rows_norm, const T droptol = 0,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 31706 diff changeset	190 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	191 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	192 // 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	193 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	194 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	195 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	196 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	197 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	198 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	199 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	200 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	201
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	203 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	204
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	206 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	207
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	209 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	210 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	211 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	212
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	213 // 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	214 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	215 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	216 T *data_in_u = sm_u.data ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	217 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	218 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	219 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	220
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	222 Array <octave_idx_type> ridx_out_l (dim_vector (max_len_l, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	223 octave_idx_type *ridx_l = ridx_out_l.rwdata ();
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	224 Array <T> data_out_l (dim_vector (max_len_l, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	225 T *data_l = data_out_l.rwdata ();
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	226
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	228 Array <octave_idx_type> ridx_out_u (dim_vector (max_len_u, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	229 octave_idx_type *ridx_u = ridx_out_u.rwdata ();
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	230 Array <T> data_out_u (dim_vector (max_len_u, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	231 T *data_u = data_out_u.rwdata ();
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	232
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	234 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	235 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	236 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	237 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	238 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	239 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	240 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	241 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	242 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	243
df64071e538c Removed ichol0.cc, icholt.cc, 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 T zero = T (0);
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	245
21604 d7a268e68e69 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 21578 diff changeset	246 // 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	247 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	248 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	249 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	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 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	252 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	253 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	254 }
df64071e538c Removed ichol0.cc, icholt.cc, 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
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	256 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	257 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	258 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	259 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	260
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	261 // 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	262 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	263 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	264 // 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	265 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	266 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	267
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	269 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	270
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	272 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	273 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	275 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	276 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	278 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	279 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	282 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	283 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	285 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	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 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	288 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	289 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 }
df64071e538c Removed ichol0.cc, icholt.cc, 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
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	293 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	295 data_out_u.resize (dim_vector (max_len_u, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	296 data_u = data_out_u.rwdata ();
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	297 ridx_out_u.resize (dim_vector (max_len_u, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	298 ridx_u = ridx_out_u.rwdata ();
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	299 }
df64071e538c Removed ichol0.cc, icholt.cc, 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
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	302 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	304 data_out_l.resize (dim_vector (max_len_l, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	305 data_l = data_out_l.rwdata ();
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	306 ridx_out_l.resize (dim_vector (max_len_l, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	307 ridx_l = ridx_out_l.rwdata ();
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	308 }
df64071e538c Removed ichol0.cc, icholt.cc, 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
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	311 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	312 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	313 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	314 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	315 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	316 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	318 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	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 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	322 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	323 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	324 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	325 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	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 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	329 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	330 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	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 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	335 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	336 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	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 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	340 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	341 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	342 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	343 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	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 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	347 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	348 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	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 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	352 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	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
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	356 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	357 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	358
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	360 if (data_u[total_len_u] == zero)
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20915 diff changeset	361 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	362
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	363 // 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	364 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	365 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	366
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	367 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	368 total_len_l += w_len_l;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	369 // 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	370 // 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	371 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	372 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	373
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	374 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	375 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	376
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	377 // 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	378 // 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	379 // 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	380 // 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	381 // 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	382 // 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	383 // 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	384 // 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	385 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	386 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	388 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	389 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	390 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	391 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	392 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	393 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	394 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	395 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	396 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	397 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	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] != -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 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	402 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	403 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	405 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	407 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	408 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	409 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	410 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	411 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	413 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	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 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	416 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	417 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	419
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	421 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	423 if (jj < (k + 1))
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	424 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	425 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	427 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	428 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	429 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	430 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	431 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	432 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	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 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	435 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	436 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	437 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	438 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	439 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	440 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	441
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	442 // Build the output matrices
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	443 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	444 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	445
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	446 // 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	447 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	448 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	449
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	450 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	451 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	452 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	453 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	454 }
20555 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 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	457 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	458
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	459 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	460 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	461 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	462 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	463 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	464
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	465 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	466 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	467
20915 a3359fe50966 remove unused nargout variables John W. Eaton <jwe@octave.org> parents: 20909 diff changeset	468 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	469 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	470 @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	471 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	472 @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	473 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	474 if (args.length () != 3)
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	475 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	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 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	478 std::string milu = args(2).string_value ();
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	479
23581 c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex. Rik <rik@octave.org> parents: 23449 diff changeset	480 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	481 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	482 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	483 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	484 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	485 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	486
31189 820d2c802247 fortran_vec: Fix instances of method chaining that may cause dangling pointer. Maged Rifaat <magedrifaat@gmail.com> parents: 30564 diff changeset	487 RowVector sm_col_norms = xcolnorms (sm);
820d2c802247 fortran_vec: Fix instances of method chaining that may cause dangling pointer. Maged Rifaat <magedrifaat@gmail.com> parents: 30564 diff changeset	488 ColumnVector sm_row_norms = xrownorms (sm);
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	489 ilu_crout <SparseMatrix, double> (sm_l, sm_u, L, U,
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	490 sm_col_norms.rwdata (),
f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	491 sm_row_norms.rwdata (),
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	492 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	493
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	494 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	495
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	496 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	497 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	498 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	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 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	501 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	502 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	503 SparseComplexMatrix U, L;
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	504 Array<Complex> cols_norm = xcolnorms (sm);
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	505 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	506
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	507 ilu_crout <SparseComplexMatrix, Complex> (sm_l, sm_u, L, U,
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	508 cols_norm.rwdata (),
f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	509 rows_norm.rwdata (),
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	510 Complex (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	511
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	512 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	513
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	514 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	515 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	516 }
df64071e538c Removed ichol0.cc, icholt.cc, 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
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	518 // 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	519 // 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	520 // 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	521 // 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	522 // 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	523 // 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	524 // 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	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 template <typename octave_matrix_t, typename T>
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 31706 diff changeset	527 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 31706 diff changeset	528 ilu_tp (octave_matrix_t& sm, octave_matrix_t& L, octave_matrix_t& U,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 31706 diff changeset	529 octave_idx_type nnz_u, octave_idx_type nnz_l, T *cols_norm,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 31706 diff changeset	530 Array <octave_idx_type>& perm_vec, const T droptol = T(0),
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 31706 diff changeset	531 const T thresh = T(0), const std::string milu = "off",
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 31706 diff changeset	532 const double udiag = 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	533 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	534 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	535 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	536 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	537 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	538 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	539 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	540 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	541 opt = OFF;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	542
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	543 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	544
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	545 // 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	546 if (opt == ROW)
20514 71e60880105a maint: Use Octave coding convention for parenthesis in __ilu__.cc. Rik <rik@octave.org> parents: 20172 diff changeset	547 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	548
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	549 // 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	550 octave_idx_type *cidx_in = sm.cidx ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	551 octave_idx_type *ridx_in = sm.ridx ();
c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	552 T *data_in = sm.data ();
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	553 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	554 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	555 T zero = T(0);
8bc45a00c8d6 avoid warnings about uninitialized variables John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	556
8bc45a00c8d6 avoid warnings about uninitialized variables John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	557 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	558
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	560 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	561 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	562 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	563
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	564 // 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	565 Array <octave_idx_type> cidx_out_l (dim_vector (n + 1, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	566 octave_idx_type *cidx_l = cidx_out_l.rwdata ();
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_l (dim_vector (max_len_l, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	568 octave_idx_type *ridx_l = ridx_out_l.rwdata ();
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	569 Array <T> data_out_l (dim_vector (max_len_l, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	570 T *data_l = data_out_l.rwdata ();
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	571
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	572 // 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	573 Array <octave_idx_type> cidx_out_u (dim_vector (n + 1, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	574 octave_idx_type *cidx_u = cidx_out_u.rwdata ();
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 Array <octave_idx_type> ridx_out_u (dim_vector (max_len_u, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	576 octave_idx_type *ridx_u = ridx_out_u.rwdata ();
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	577 Array <T> data_out_u (dim_vector (max_len_u, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	578 T *data_u = data_out_u.rwdata ();
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	579
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	580 // 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	581 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	582 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	583 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	584 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	585 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	586 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	587 OCTAVE_LOCAL_BUFFER (octave_idx_type, iperm, n);
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	588 octave_idx_type *perm = perm_vec.rwdata ();
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	589 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	590
21604 d7a268e68e69 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 21578 diff changeset	591 // 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	592 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	593 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	594 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	595 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	597 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	598 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	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 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	601 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	602
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	603 // 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	604 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	605 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	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 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	609 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	610 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	611 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	612 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	613 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	614 }
df64071e538c Removed ichol0.cc, icholt.cc, 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
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	617 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	618 total_sum = zero;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	619 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	620 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	622 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	623 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	624 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	626 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	628 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	629 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	631 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	633 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	634 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	635 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	637 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	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 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	640 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	641 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	642 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	643 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	644 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	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 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	648 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	649 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	650 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	651 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	652 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	653 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	654 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	655
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	656 // 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	657 // 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	658 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	659 && (w_data[jrow] != zero))
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	660 {
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	661 if (opt == COL)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	662 total_sum += partial_col_sum;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	663 else if (opt == ROW)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	664 total_sum += partial_row_sum;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	665 w_data[jrow] = zero;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	666 it2 = it;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	667 it++;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	668 iw_u.erase (it2);
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	669 jrow = *it;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	670 continue;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	671 }
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	672 else
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	673 // 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	674 // in the actual iteration
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	675 if (opt == ROW)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	676 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	677 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	679 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	682 // 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	683 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	684 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	686 max_ind = perm[k];
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	687 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	688 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	689 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	690 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	691 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	693 max_ind = *it;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	694 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	695 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 }
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	697 // 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	698 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	699 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	700 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	702 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	703 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	704 else
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	705 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	706 // 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	707 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	708 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	709 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	710 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	711 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	712 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	713 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	714 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	715 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	716
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	717 }
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	718
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	719 // 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	720 // 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	721 it = iw_l.begin ();
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	722 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	723 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	725 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	726 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	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 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	729 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	730 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	731 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	732 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	733 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	734 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	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
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	738 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 // If milu == [row\|col] summation is preserved.
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	741 // 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	742 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	743 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 ((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	745 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	746 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	747 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	748
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	749 // 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	750 // 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	751 // 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	752 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	753 {
20980 81c2b14c209f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20956 diff changeset	754 if (udiag != 1)
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20915 diff changeset	755 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	756
81c2b14c209f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20956 diff changeset	757 w_data[k] = droptol;
81c2b14c209f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20956 diff changeset	758 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	759 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	760
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	761 // 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	762 if (opt != ROW)
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	763 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	764 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	765 p_perm = iperm[*it];
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	766 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	767 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	768
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	769 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	770 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	772 data_out_u.resize (dim_vector (max_len_u, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	773 data_u = data_out_u.rwdata ();
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	774 ridx_out_u.resize (dim_vector (max_len_u, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	775 ridx_u = ridx_out_u.rwdata ();
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	776 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	779 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	781 data_out_l.resize (dim_vector (max_len_l, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	782 data_l = data_out_l.rwdata ();
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	783 ridx_out_l.resize (dim_vector (max_len_l, 1));
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	784 ridx_l = ridx_out_l.rwdata ();
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	785 }
df64071e538c Removed ichol0.cc, icholt.cc, 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
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	788 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	789 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	790 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	791 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	792 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	794 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	795 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	796 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	798 }
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	799
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	800 // 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	801 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	802 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	803 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	805 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	806 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	807 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	808 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	809 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	810 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	811 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	812 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	814 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	815
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	816 // 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	817 // 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	818 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	819 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	820
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	821 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	822 uptr[k] = total_len_u - 1;
20980 81c2b14c209f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20956 diff changeset	823
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	824 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	825 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	826
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	827 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	828 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	829 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	830
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	831 octave_matrix_t *L_ptr;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	832 octave_matrix_t *U_ptr;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	833 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	834
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	835 // 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	836 // 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	837 // versions of the algorithm.
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	838 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	839 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	840 L_ptr = &U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	841 U_ptr = &L;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	842 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	843 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	844 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	845 else
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 = &L;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	848 U_ptr = &U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	849 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	850 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	851 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 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 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	856 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	857 if (opt == ROW)
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	858 U_ptr->cidx (i) -= i;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	859 }
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	860
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	861 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	862 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	863 if (opt == ROW)
30390 a61e1a0f6024 maint: style check C++ files in libinterp/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29961 diff changeset	864 diag.elem (i, i) = data_u[uptr[i]];
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	865 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	866
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	867 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	868 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	869 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	870 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	871 j++;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	872 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	873 j = cidx_u[i];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	874
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	875 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	876 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	877 c = j;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	878 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	879 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	880 // 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	881 // 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	882 // 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	883 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	884 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	885 j++;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	886 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	887 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	888 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	889 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	890 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	891 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	892 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	893 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	894 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	895 }
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	896
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	897 if (opt == ROW)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	898 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	899 U = U.transpose ();
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	900 // The diagonal, conveniently permuted is added to U
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	901 U += diag.index (idx_vector::colon, perm_vec);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	902 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	903 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	905
19877 12ecb7212b44 move some files without external dependencies from dldfcn to corefcn John W. Eaton <jwe@octave.org> parents: 19795 diff changeset	906 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	907 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	908 @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	909 @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	910 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	911 @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	912 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	913 if (args.length () != 5)
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	914 print_usage ();
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	915
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	916 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	917 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	918 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	919 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	920 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	921
21419 13415264b9f8 Fix out-of-bounds memory access in ichol, ilu (bug #46449). Rik <rik@octave.org> parents: 21308 diff changeset	922 octave_value_list arg_list;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	923 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	924 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	925 {
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 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	927 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	928 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	929 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	930 Array <double> rc_norm;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	931 if (milu == "row")
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	932 rc_norm = xrownorms (sm);
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	933 else
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	934 rc_norm = xcolnorms (sm);
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	935 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	936
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	937 ilu_tp <SparseMatrix, double> (sm, L, U, nnz_u, nnz_l,
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	938 rc_norm.rwdata (),
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	939 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	940
d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	941 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	942 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	943 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	944 retval(0) = L + speye;
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	945 if (nargout == 3)
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	946 {
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	947 retval(1) = U.index (idx_vector::colon, perm);
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	948 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	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 else
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	951 retval(1) = U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	952 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	953 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	954 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	955 retval(1) = U;
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	956 if (nargout == 3)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	957 {
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	958 retval(0) = L.index (perm, idx_vector::colon) + speye;
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	959 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	960 }
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	961 else
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	962 retval(0) = L + speye.index (idx_vector::colon, 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	963 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	964 }
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	965 else
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	966 {
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 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	968 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	969 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	970 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	971 Array <Complex> rc_norm;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	972 if (milu == "row")
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	973 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	974 else
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	975 rc_norm = xcolnorms (sm);
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	976 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	977
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	978 ilu_tp <SparseComplexMatrix, Complex>
32660 f53ac65ffba6 maint: New method rwdata() as clearer alternative to fortran_vec(). Rik <rik@octave.org> parents: 32632 diff changeset	979 (sm, L, U, nnz_u, nnz_l, rc_norm.rwdata (), perm,
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	980 Complex (droptol), Complex (thresh), milu, udiag);
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	981
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	982 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	983 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	984 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	985 retval(0) = L + speye;
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	986 if (nargout == 3)
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	987 {
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	988 retval(1) = U.index (idx_vector::colon, perm);
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	989 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	990 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	991 else if (nargout == 2)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	992 retval(1) = U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	993 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	994 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	995 {
23099 d44537a50f4b __ilu__ and __ichol__: use liboctave functions instead of feval (bug #50105) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	996 retval(1) = U;
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	997 if (nargout == 3)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	998 {
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	999 retval(0) = L.index (perm, idx_vector::colon) + speye;
7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	1000 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	1001 }
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	1002 else
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	1003 retval(0) = L + speye.index (idx_vector::colon, 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	1004 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1006
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1007 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	1008 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1009
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1010 /*
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1011 ## 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	1012 %!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	1013 */
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29874 diff changeset	1014
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 31189 diff changeset	1015 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate libinterp/corefcn/__ilu__.cc @ 33527:d10bed2b2cb4 bytecode-interpreter tip

annotate libinterp/corefcn/ilu.cc @ 33527:d10bed2b2cb4 bytecode-interpreter tip