octave: libinterp/corefcn/__ilu_

annotate libinterp/corefcn/ilu.cc @ 20956:850e3d2533d4

maint: Eliminate more useless statements after error(). * __ilu__.cc, display.cc, file-io.cc, graphics.cc, graphics.in.h, hex2num.cc, load-save.cc, ls-mat-ascii.cc, oct-errno.in.cc, pager.cc, sighandlers.cc, sub2ind.cc, symtab.h, syscalls.cc, toplev.h, txt-eng-ft.cc, __eigs__.cc, ov-bool-mat.cc, ov-classdef.h, ov-cx-mat.cc, ov-fcn-handle.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-re-mat.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-usr-fcn.cc: maint: Eliminate more useless statements after error().

author	Rik <rik@octave.org>
date	Sun, 20 Dec 2015 13:26:17 -0800
parents	a3359fe50966
children	81c2b14c209f

rev	line source
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1 /*
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19269 diff changeset	3 Copyright (C) 2014-2015 Eduardo Ramos Fernández <eduradical951@gmail.com>
4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19269 diff changeset	4 Copyright (C) 2013-2015 Kai T. Ohlhus <k.ohlhus@gmail.com>
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	5
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	6 This file is part of Octave.
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	7
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	8 Octave is free software; you can redistribute it and/or modify it
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	9 under the terms of the GNU General Public License as published by the
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	11 option) any later version.
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	12
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	16 for more details.
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	17
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	18 You should have received a copy of the GNU General Public License
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	19 along with Octave; see the file COPYING. If not, see
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	20 <http://www.gnu.org/licenses/>.
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	21
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	22 */
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	23
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	24 #ifdef HAVE_CONFIG_H
df64071e538c Removed ichol0.cc, icholt.cc, 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 #include <config.h>
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	26 #endif
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	27
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 19241 diff changeset	28 #include "oct-locbuf.h"
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 19241 diff changeset	29
19877 12ecb7212b44 move some files without external dependencies from dldfcn to corefcn John W. Eaton <jwe@octave.org> parents: 19795 diff changeset	30 #include "defun.h"
12ecb7212b44 move some files without external dependencies from dldfcn to corefcn John W. Eaton <jwe@octave.org> parents: 19795 diff changeset	31 #include "error.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	32 #include "parse.h"
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	33
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	34 // That function implements the IKJ and JKI variants of Gaussian elimination to
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	35 // perform the ILUTP decomposition. The behaviour is controlled by milu
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	36 // 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	37 // 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	38 // 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	39 // 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	40 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	41 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	42 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	43
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	44 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	45 OCTAVE_LOCAL_BUFFER (octave_idx_type, iw, 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	46 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	47 octave_idx_type j1, j2, jrow, jw, i, k, 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	48 T tl, r;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	49
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	50 enum {OFF, ROW, COL};
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	51 char opt;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	52 if (milu == "row")
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	53 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	54 opt = ROW;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	55 sm = sm.transpose ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	56 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	57 else if (milu == "col")
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	58 opt = COL;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	59 else
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	60 opt = OFF;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	61
df64071e538c Removed ichol0.cc, icholt.cc, 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 octave_idx_type* cidx = sm.cidx ();
df64071e538c Removed ichol0.cc, icholt.cc, 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 octave_idx_type* ridx = sm.ridx ();
df64071e538c Removed ichol0.cc, icholt.cc, 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 T* data = sm.data ();
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	66 iw[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	67 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	68 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	69 j1 = cidx[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	70 j2 = cidx[k+1] - 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	71 octave_idx_type 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	72 for (j = j1; j <= j2; 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	73 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	74 iw[ridx[j]] = 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	75 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	77 j = j1;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	78 jrow = ridx[j];
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	79 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	80 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	82 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	83 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	84 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	85 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	86 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	87 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	88 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	89 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	90 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	91 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	92 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	93 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	94
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	96 // 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	97 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	98 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	99 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	100 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	101 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	103 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	104 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 uptr[k] = j;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	106 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	107 data[uptr[k]] -= r;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	108 if (opt != ROW)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	109 for (jj = uptr[k] + 1; jj < cidx[k+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	110 data[jj] /= data[uptr[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	111 if (k != jrow)
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20915 diff changeset	112 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	113
df64071e538c Removed ichol0.cc, icholt.cc, 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 if (data[j] == T(0))
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20915 diff changeset	115 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	116 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	117 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	118 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	120 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	121 }
df64071e538c Removed ichol0.cc, icholt.cc, 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
20915 a3359fe50966 remove unused nargout variables John W. Eaton <jwe@octave.org> parents: 20909 diff changeset	123 DEFUN (__ilu0__, args, ,
19877 12ecb7212b44 move some files without external dependencies from dldfcn to corefcn John W. Eaton <jwe@octave.org> parents: 19795 diff changeset	124 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20812 diff changeset	125 @deftypefn {} {[@var{L}, @var{U}] =} __ilu0__ (@var{A})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20812 diff changeset	126 @deftypefnx {} {[@var{L}, @var{U}] =} __ilu0__ (@var{A}, @var{milu})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20812 diff changeset	127 @deftypefnx {} {[@var{L}, @var{U}, @var{P}] =} __ilu0__ (@var{A}, @dots{})\n\
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 Undocumented internal function.\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	129 @end deftypefn")
df64071e538c Removed ichol0.cc, icholt.cc, 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 int nargin = args.length ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	132
20909 03e4ddd49396 omit unnecessary nargout checks John W. Eaton <jwe@octave.org> parents: 20892 diff changeset	133 if (nargin < 1 \|\| nargin > 2)
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	134 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	135
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	136 octave_value_list retval (2);
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	137
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	138 std::string milu;
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	139
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	140 // In ILU0 algorithm the zero-pattern of the input matrix is preserved so
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	141 // it's structure does not change during the algorithm. The same input
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	142 // matrix is used to build the output matrix due to that fact.
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	143 octave_value_list param_list;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	144 if (! args(0).is_complex_type ())
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	145 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	146 SparseMatrix sm = args(0).sparse_matrix_value ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	147 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	148
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	149 param_list.append (sm);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	150 retval(1) = feval ("triu", param_list)(0).sparse_matrix_value ();
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	151 SparseMatrix eye =
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	152 feval ("speye", octave_value_list (octave_value (sm.cols ())))(0).sparse_matrix_value ();
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	153 param_list.append (-1);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	154 retval(0) = eye +
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	155 feval ("tril", param_list)(0).sparse_matrix_value ();
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	156 }
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	157 else
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	158 {
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	159 SparseComplexMatrix sm = args(0).sparse_complex_matrix_value ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	160 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	161
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	162 param_list.append (sm);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	163 retval(1) =
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	164 feval ("triu", param_list)(0).sparse_complex_matrix_value ();
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	165 SparseComplexMatrix eye =
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	166 feval ("speye", octave_value_list (octave_value (sm.cols ())))(0).sparse_complex_matrix_value ();
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	167 param_list.append (-1);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	168 retval(0) =
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	169 eye + feval ("tril", param_list)(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	170 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	171
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	172 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	173 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	174
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	175 template <typename octave_matrix_t, typename T>
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	176 void ilu_crout (octave_matrix_t& sm_l, octave_matrix_t& sm_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	177 octave_matrix_t& L, octave_matrix_t& U, T* cols_norm,
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	178 T* rows_norm, const T droptol = 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	179 const std::string milu = "off")
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	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
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	182 // 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	183 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	184 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	185 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	186 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	187 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	188 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	189 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	190 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	191
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	192 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	193 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	194
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	196 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	197
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	198 max_len_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	199 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	200 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	201 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	202 // Extract pointers to the arrays for faster access inside loops
df64071e538c Removed ichol0.cc, icholt.cc, 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 octave_idx_type* cidx_in_u = sm_u.cidx ();
df64071e538c Removed ichol0.cc, icholt.cc, 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 octave_idx_type* ridx_in_u = sm_u.ridx ();
df64071e538c Removed ichol0.cc, icholt.cc, 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 T* data_in_u = sm_u.data ();
df64071e538c Removed ichol0.cc, icholt.cc, 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 octave_idx_type* cidx_in_l = sm_l.cidx ();
df64071e538c Removed ichol0.cc, icholt.cc, 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 octave_idx_type* ridx_in_l = sm_l.ridx ();
df64071e538c Removed ichol0.cc, icholt.cc, 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 T* data_in_l = sm_l.data ();
df64071e538c Removed ichol0.cc, icholt.cc, 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
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	211 Array <octave_idx_type> ridx_out_l (dim_vector (max_len_l, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	212 octave_idx_type* ridx_l = ridx_out_l.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	213 Array <T> data_out_l (dim_vector (max_len_l, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	214 T* data_l = data_out_l.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	215
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	216 // 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	217 Array <octave_idx_type> ridx_out_u (dim_vector (max_len_u, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	218 octave_idx_type* ridx_u = ridx_out_u.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	219 Array <T> data_out_u (dim_vector (max_len_u, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	220 T* data_u = data_out_u.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	221
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	222 // 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	223 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	224 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	225 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	226 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	227 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	228 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	229 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	230 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	231 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	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 T zero = T (0);
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	234
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	235 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	236 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	237 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	238 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	239 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	240 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	241 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	242 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	245 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	246 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	247 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	248
df64071e538c Removed ichol0.cc, icholt.cc, 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 (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	250 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	251 // 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	252 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	253 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	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 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	256 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	257
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	259 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	260 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	261 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	262 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	263 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	264 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	265 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	266 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	269 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	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 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	272 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	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 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	275 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	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 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	278
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	279 if ((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	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 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	282 data_out_u.resize (dim_vector (max_len_u, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	283 data_u = data_out_u.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	284 ridx_out_u.resize (dim_vector (max_len_u, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	285 ridx_u = ridx_out_u.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	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
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	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 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	291 data_out_l.resize (dim_vector (max_len_l, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	292 data_l = data_out_l.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	293 ridx_out_l.resize (dim_vector (max_len_l, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	294 ridx_l = ridx_out_l.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	295 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	296
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	298 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	299 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	300 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	301 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	302 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	303 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	304 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	305 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	307 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	309 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	310 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	311 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	312 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	314 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	316 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	317 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	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 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	322 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	323 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	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 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	327 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	328 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	329 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	330 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	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 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	334 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	335 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	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 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	339 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	340 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	341
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	343 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	344 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	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 // 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	347 if (data_u[total_len_u] == zero)
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20915 diff changeset	348 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	349
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	350 // 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	351 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	352 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	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 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	356 total_len_l += w_len_l;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	357 // 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	358 // 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	359 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	360 error ("ilu: integer overflow. Too many fill-in elements in L or 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	361 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	362 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	363
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	364 // 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	365 // 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	366 // 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	367 // 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	368 // indices pointing to Ufirst and Lfirst respectively.
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	369 // TODO: 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	370 // 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	371 // 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	372 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	373 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	375 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	376 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	377 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	378 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	379 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	380 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	381 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	382 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	383 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	384 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	385 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	386 if (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	387 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	389 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	390 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 (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	392 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	394 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	395 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	396 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	397 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	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 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	400 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	401 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	403 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	404 }
df64071e538c Removed ichol0.cc, icholt.cc, 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
df64071e538c Removed ichol0.cc, icholt.cc, 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 (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	408 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	410 if (jj < (k + 1))
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	411 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	412 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	413 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	414 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	415 Lfirst[i] = -1;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	416 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	417 jj = ridx_l[Lfirst[i]];
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	418 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	419 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	420 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	421 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	422 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	423 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	424 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 }
df64071e538c Removed ichol0.cc, icholt.cc, 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
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	429 // Build the output matrices
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	430 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	431 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	432
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	433 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	434 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	435
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	436 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	437 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	438 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	439 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	440 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	441
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	442 for (i = 0; i <= n; i++)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	443 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	444
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	445 for (i = 0; i < total_len_u; i++)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	446 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	447 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	448 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	449 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	450
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	451 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	452 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	453
20915 a3359fe50966 remove unused nargout variables John W. Eaton <jwe@octave.org> parents: 20909 diff changeset	454 DEFUN (__iluc__, args, ,
19877 12ecb7212b44 move some files without external dependencies from dldfcn to corefcn John W. Eaton <jwe@octave.org> parents: 19795 diff changeset	455 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20812 diff changeset	456 @deftypefn {} {[@var{L}, @var{U}] =} __iluc__ (@var{A})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20812 diff changeset	457 @deftypefnx {} {[@var{L}, @var{U}] =} __iluc__ (@var{A}, @var{droptol})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20812 diff changeset	458 @deftypefnx {} {[@var{L}, @var{U}] =} __iluc__ (@var{A}, @var{droptol}, @var{milu})\n\
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	459 Undocumented internal function.\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	460 @end deftypefn")
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	461 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	462 int nargin = args.length ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	463
20909 03e4ddd49396 omit unnecessary nargout checks John W. Eaton <jwe@octave.org> parents: 20892 diff changeset	464 if (nargin < 1 \|\| nargin > 3)
20803 c22206c1a88f eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	465 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	466
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	467 std::string milu = "off";
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	468 double droptol = 0;
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	469
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	470 // Don't repeat input validation of arguments done in ilu.m
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	471 if (nargin >= 2)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	472 droptol = args(1).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	473
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	474 if (nargin == 3)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	475 milu = args(2).string_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	476
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	477 octave_value_list param_list;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	478 if (! args(0).is_complex_type ())
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	479 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	480 Array<double> cols_norm, rows_norm;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	481 param_list.append (args(0).sparse_matrix_value ());
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	482 SparseMatrix sm_u = feval ("triu", param_list)(0).sparse_matrix_value ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	483 param_list.append (-1);
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	484 SparseMatrix sm_l = feval ("tril", param_list)(0).sparse_matrix_value ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	485 param_list(1) = "rows";
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	486 rows_norm = feval ("norm", param_list)(0).vector_value ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	487 param_list(1) = "cols";
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	488 cols_norm = feval ("norm", param_list)(0).vector_value ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	489 param_list.clear ();
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	490 SparseMatrix U, L;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	491 ilu_crout <SparseMatrix, double> (sm_l, sm_u, L, U,
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	492 cols_norm.fortran_vec (),
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	493 rows_norm.fortran_vec (),
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	494 droptol, milu);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	495 param_list.append (octave_value (L.cols ()));
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	496 SparseMatrix eye =
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	497 feval ("speye", param_list)(0).sparse_matrix_value ();
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	498 return ovl (L + eye, 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	499 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	500 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	501 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	502 Array<Complex> cols_norm, rows_norm;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	503 param_list.append (args(0).sparse_complex_matrix_value ());
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	504 SparseComplexMatrix sm_u =
20514 71e60880105a maint: Use Octave coding convention for parenthesis in __ilu__.cc. Rik <rik@octave.org> parents: 20172 diff changeset	505 feval ("triu", param_list)(0).sparse_complex_matrix_value ();
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	506 param_list.append (-1);
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	507 SparseComplexMatrix sm_l =
20514 71e60880105a maint: Use Octave coding convention for parenthesis in __ilu__.cc. Rik <rik@octave.org> parents: 20172 diff changeset	508 feval ("tril", param_list)(0).sparse_complex_matrix_value ();
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	509 param_list(1) = "rows";
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	510 rows_norm = feval ("norm", param_list)(0).complex_vector_value ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	511 param_list(1) = "cols";
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	512 cols_norm = feval ("norm", param_list)(0).complex_vector_value ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	513 param_list.clear ();
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	514 SparseComplexMatrix U, L;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	515 ilu_crout < SparseComplexMatrix, Complex >
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	516 (sm_l, sm_u, L, U, cols_norm.fortran_vec () ,
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	517 rows_norm.fortran_vec (), Complex (droptol), milu);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	518
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	519 param_list.append (octave_value (L.cols ()));
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	520 SparseComplexMatrix eye =
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	521 feval ("speye", param_list)(0).sparse_complex_matrix_value ();
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	522 return ovl (L + eye, 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	523 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 }
df64071e538c Removed ichol0.cc, icholt.cc, 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
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	526 // That function implements the IKJ and JKI variants of gaussian elimination
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	527 // to perform the ILUTP decomposition. The behaviour is controlled by milu
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	528 // 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	529 // 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	530 // 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	531 // 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	532 // 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	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 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	535 void ilu_tp (octave_matrix_t& sm, octave_matrix_t& L, octave_matrix_t& U,
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	536 octave_idx_type nnz_u, octave_idx_type nnz_l, T* cols_norm,
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	537 Array <octave_idx_type>& perm_vec, const T droptol = T(0),
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	538 const T thresh = T(0), const std::string milu = "off",
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	539 const double udiag = 0)
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	540 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	541 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	542 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	543 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	544 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	545 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	546 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	547 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	548 opt = OFF;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	549
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	550 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	551
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	552 // That is necessary for the JKI (milu = "row") variant.
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	553 if (opt == ROW)
20514 71e60880105a maint: Use Octave coding convention for parenthesis in __ilu__.cc. Rik <rik@octave.org> parents: 20172 diff changeset	554 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	555
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	556 // Extract pointers to the arrays for faster access inside loops
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	557 octave_idx_type* cidx_in = sm.cidx ();
df64071e538c Removed ichol0.cc, icholt.cc, 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 octave_idx_type* ridx_in = sm.ridx ();
df64071e538c Removed ichol0.cc, icholt.cc, 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 T* data_in = sm.data ();
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	560 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	561 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	562 T zero = T(0);
8bc45a00c8d6 avoid warnings about uninitialized variables John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	563
8bc45a00c8d6 avoid warnings about uninitialized variables John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	564 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	565
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	566 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	567 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	568 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	569 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	570
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	571 Array <octave_idx_type> cidx_out_l (dim_vector (n + 1, 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	572 octave_idx_type* cidx_l = cidx_out_l.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	573 Array <octave_idx_type> ridx_out_l (dim_vector (max_len_l, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	574 octave_idx_type* ridx_l = ridx_out_l.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	575 Array <T> data_out_l (dim_vector (max_len_l ,1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	576 T* data_l = data_out_l.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	577 // 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	578 Array <octave_idx_type> cidx_out_u (dim_vector (n + 1, 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	579 octave_idx_type* cidx_u = cidx_out_u.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	580 Array <octave_idx_type> ridx_out_u (dim_vector (max_len_u, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	581 octave_idx_type* ridx_u = ridx_out_u.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	582 Array <T> data_out_u (dim_vector (max_len_u, 1));
20514 71e60880105a maint: Use Octave coding convention for parenthesis in __ilu__.cc. Rik <rik@octave.org> parents: 20172 diff changeset	583 T* data_u = data_out_u.fortran_vec ();
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	584
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	586 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	587 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	588 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	589 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	590 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	591 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	592 OCTAVE_LOCAL_BUFFER (octave_idx_type, iperm, 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	593 octave_idx_type* perm = perm_vec.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	594 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	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
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	598 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	599 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	600 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	601 w_data[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	602 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	603 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	604 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	606 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	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 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	609 {
df64071e538c Removed ichol0.cc, icholt.cc, 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
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	612 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	613 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	614 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	615 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	616 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	617 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	618 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	619 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	622 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	623 total_sum = zero;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	624 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	625 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	626 if (opt == 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	627 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	628 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	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 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	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 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	633 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	634 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	636 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	638 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	639 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	640 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	641 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	642 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	643 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	645 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	646 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	647 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	648 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	649 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	650 }
df64071e538c Removed ichol0.cc, icholt.cc, 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
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	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 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	655 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	656 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	657 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	658 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	659 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	660
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	661 // Drop element from the U part in IKJ and L part in JKI
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	662 // variant (milu = [col\|off])
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	663 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	664 && (w_data[jrow] != zero))
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	665 {
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	666 if (opt == COL)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	667 total_sum += partial_col_sum;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	668 else if (opt == ROW)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	669 total_sum += partial_row_sum;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	670 w_data[jrow] = zero;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	671 it2 = it;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	672 it++;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	673 iw_u.erase (it2);
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	674 jrow = *it;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	675 continue;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	676 }
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	677 else
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	678 // 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	679 // in the actual iteration
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	680 if (opt == ROW)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	681 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	682 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	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
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	687 // 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	688 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	689 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	691 max_ind = perm[k];
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	692 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	693 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	694 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	695 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	696 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	697 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	698 max_ind = *it;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	699 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	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 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 the pivot is not the diagonal element update all.
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	704 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	705 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	707 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	708 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	709 else
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	710 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	711 // 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	712 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	713 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	714 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	715 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	716 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	717 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	718 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	719 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	720 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	721
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	722 }
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 // Drop elements in the L part in the IKJ and from the U part in the JKI
df64071e538c Removed ichol0.cc, icholt.cc, 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 // version.
df64071e538c Removed ichol0.cc, icholt.cc, 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 it = iw_l.begin ();
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	727 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	728 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	729 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	730 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	731 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	732 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	734 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	735 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	736 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	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 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	739 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	740 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	741
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	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
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	745 // If milu == [row\|col] summation is preserved.
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	746 // 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	747 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	748 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	750 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	751 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	752 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	753
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	754
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	755
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	756 // 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	757 // 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	758 // 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	759 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	760 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	761 if (udiag == 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	762 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	763 w_data[k] = droptol;
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	765 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	766 else
20956 850e3d2533d4 maint: Eliminate more useless statements after error(). Rik <rik@octave.org> parents: 20915 diff changeset	767 error ("ilu: encountered a pivot equal to 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	768 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	769
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	770 // 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	771 if (opt != ROW)
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	772 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	773 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	774 p_perm = iperm[*it];
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	775 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	776 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	777
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	778
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	779 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	780 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	782 data_out_u.resize (dim_vector (max_len_u, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	783 data_u = data_out_u.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	784 ridx_out_u.resize (dim_vector (max_len_u, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	785 ridx_u = ridx_out_u.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	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
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	789 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	791 data_out_l.resize (dim_vector (max_len_l, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	792 data_l = data_out_l.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	793 ridx_out_l.resize (dim_vector (max_len_l, 1));
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	794 ridx_l = ridx_out_l.fortran_vec ();
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	795 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	796
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	798 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	799 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	800 {
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	802 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	803 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	804 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	805 w_len_u++;
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	806 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 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	808 }
df64071e538c Removed ichol0.cc, icholt.cc, 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 // 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	810 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	811 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	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 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	814 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	815 {
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	816 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	817 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	818 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	819 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	820 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	821 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	822 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	823 total_len_l += w_len_l;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	824 // 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	825 // 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	826 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	827 error ("ilu: Integer overflow. Too many fill-in elements in L or 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	828 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	829 uptr[k] = total_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	830 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	831 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	832
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	833 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	834 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	835 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	836
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	837 octave_matrix_t *L_ptr;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	838 octave_matrix_t *U_ptr;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	839 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	840
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	841 // 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	842 // 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	843 // versions of the algorithm.
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	844 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	845 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	846 L_ptr = &U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	847 U_ptr = &L;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	848 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	849 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	850 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	851 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	852 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	853 L_ptr = &L;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	854 U_ptr = &U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	855 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	856 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	857 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	858
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	859 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	860 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	861 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	862 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	863 if (opt == ROW)
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	864 U_ptr->cidx (i) -= i;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	865 }
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 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	868 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	869 if (opt == ROW)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	870 diag.elem (i,i) = data_u[uptr[i]];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	871 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	872
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	873 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	874 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	875 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	876 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	877 j++;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	878 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	879 j = cidx_u[i];
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	880
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	881 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	882 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	883 c = j;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	884 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	885 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	886 // 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	887 // 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	888 // 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	889 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	890 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	891 j++;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	892 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	893 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	894 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	895 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	896 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	897 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	898 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	899 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	900 }
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	901 }
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	902
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	903 if (opt == ROW)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	904 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	905 U = U.transpose ();
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	906 // The diagonal, conveniently permuted is added to U
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	907 U += diag.index (idx_vector::colon, perm_vec);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	908 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	909 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	910 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	911
19877 12ecb7212b44 move some files without external dependencies from dldfcn to corefcn John W. Eaton <jwe@octave.org> parents: 19795 diff changeset	912 DEFUN (__ilutp__, args, nargout,
12ecb7212b44 move some files without external dependencies from dldfcn to corefcn John W. Eaton <jwe@octave.org> parents: 19795 diff changeset	913 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20812 diff changeset	914 @deftypefn {} {[@var{L}, @var{U}] =} __ilutp__ (@var{A})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20812 diff changeset	915 @deftypefnx {} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20812 diff changeset	916 @deftypefnx {} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20812 diff changeset	917 @deftypefnx {} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh}, @var{milu})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20812 diff changeset	918 @deftypefnx {} {[@var{L}, @var{U}] =} __ilutp__ (@var{A}, @var{droptol}, @var{thresh}, @var{milu}, @var{udiag})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20812 diff changeset	919 @deftypefnx {} {[@var{L}, @var{U}, @var{P}] =} __ilutp__ (@var{A}, @dots{})\n\
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	920 Undocumented internal function.\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	921 @end deftypefn")
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	922 {
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	923 int nargin = args.length ();
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	924
20909 03e4ddd49396 omit unnecessary nargout checks John W. Eaton <jwe@octave.org> parents: 20892 diff changeset	925 if (nargin < 1 \|\| nargin > 5)
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	926 print_usage ();
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	927
c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	928 octave_value_list retval;
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	929 std::string milu = "";
20812 d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20803 diff changeset	930 double droptol = 0;
d9ca869ca124 maint: Clean-up more instances of print_usage(). Rik <rik@octave.org> parents: 20803 diff changeset	931 double thresh = 1;
19241 64dc954cf06c Fix use of uninitialised variables in __ilu__.cc. PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com> parents: 19055 diff changeset	932 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	933
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	934 // Don't repeat input validation of arguments done in ilu.m
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	935 if (nargin >= 2)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	936 droptol = args(1).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	937
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	938 if (nargin >= 3)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	939 thresh = args(2).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	940
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	941 if (nargin >= 4)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	942 milu = args(3).string_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	943
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	944 if (nargin == 5)
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	945 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	946
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	947 octave_value_list param_list;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	948 octave_idx_type nnz_u, nnz_l;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	949 if (! args(0).is_complex_type ())
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	950 {
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	951 Array <double> rc_norm;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	952 SparseMatrix sm = args(0).sparse_matrix_value ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	953 param_list.append (sm);
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	954 nnz_u = (feval ("triu", param_list)(0).sparse_matrix_value ()).nnz ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	955 param_list.append (-1);
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	956 nnz_l = (feval ("tril", param_list)(0).sparse_matrix_value ()).nnz ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	957 if (milu == "row")
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	958 param_list (1) = "rows";
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	959 else
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	960 param_list (1) = "cols";
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	961 rc_norm = feval ("norm", param_list)(0).vector_value ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	962 param_list.clear ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	963 Array <octave_idx_type> perm (dim_vector (sm.cols (), 1));
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	964 SparseMatrix U, L;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	965 ilu_tp <SparseMatrix, double> (sm, L, U, nnz_u, nnz_l,
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	966 rc_norm.fortran_vec (),
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	967 perm, droptol, thresh, milu, udiag);
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	968 param_list.append (octave_value (L.cols ()));
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	969 SparseMatrix eye =
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	970 feval ("speye", param_list)(0).sparse_matrix_value ();
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	971 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	972 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	973 if (nargout == 3)
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	974 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	975 retval(2) = eye.index (idx_vector::colon, perm);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	976 retval(1) = U.index (idx_vector::colon, perm);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	977 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	978 else if (nargout == 2)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	979 retval(1) = U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	980 retval(0) = L + eye;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	981 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	982 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	983 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	984 if (nargout == 3)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	985 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	986 retval(2) = eye.index (perm, idx_vector::colon);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	987 retval(1) = U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	988 retval(0) = L.index (perm, idx_vector::colon) + eye;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	989 }
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	990 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	991 {
20555 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 retval(0) = L + eye.index (perm, idx_vector::colon);
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	994 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	995 }
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	996 }
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	997 else
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	998 {
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	999 Array <Complex> rc_norm;
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1000 SparseComplexMatrix sm = args(0).sparse_complex_matrix_value ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1001 param_list.append (sm);
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1002 nnz_u =
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1003 feval ("triu", param_list)(0).sparse_complex_matrix_value ().nnz ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1004 param_list.append (-1);
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1005 nnz_l =
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1006 feval ("tril", param_list)(0).sparse_complex_matrix_value ().nnz ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1007 if (milu == "row")
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1008 param_list(1) = "rows";
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	1009 else
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1010 param_list(1) = "cols";
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1011 rc_norm = feval ("norm", param_list)(0).complex_vector_value ();
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1012 Array <octave_idx_type> perm (dim_vector (sm.cols (), 1));
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1013 param_list.clear ();
20892 c07bee629973 2015 Code Sprint: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	1014 SparseComplexMatrix U, L;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1015 ilu_tp < SparseComplexMatrix, Complex>
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1016 (sm, L, U, nnz_u, nnz_l, rc_norm.fortran_vec (), perm,
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1017 Complex (droptol), Complex (thresh), milu, udiag);
38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1018
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1019 param_list.append (octave_value (L.cols ()));
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1020 SparseComplexMatrix eye =
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1021 feval ("speye", param_list)(0).sparse_complex_matrix_value ();
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1022 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	1023 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1024 if (nargout == 3)
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1025 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1026 retval(2) = eye.index (idx_vector::colon, perm);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1027 retval(1) = U.index (idx_vector::colon, perm);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1028 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1029 else if (nargout == 2)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1030 retval(1) = U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1031 retval(0) = L + eye;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1032 }
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1033 else
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1034 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1035 if (nargout == 3)
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1036 {
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1037 retval(2) = eye.index (perm, idx_vector::colon);
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1038 retval(1) = U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1039 retval(0) = L.index (perm, idx_vector::colon) + eye;
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1040 }
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	1041 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	1042 {
20555 f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1043 retval(1) = U;
f90c8372b7ba eliminate many more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20514 diff changeset	1044 retval(0) = L + eye.index (perm, idx_vector::colon);
19054 df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1045 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1046 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1047 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1048
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1049 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	1050 }
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1051
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1052 /*
df64071e538c Removed ichol0.cc, icholt.cc, ilu0.cc, iluc.cc, ilutp.cc. Created __ichol__.cc and __ilu__.cc. Minor bugs fixed. Eduardo Ramos (edu159) <eduradical951@gmail.com> parents: diff changeset	1053 ## 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	1054 %!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	1055 */
19055 38937efbee21 Incorporate new functions ichol and ilu into Octave. Rik <rik@octave.org> parents: 19054 diff changeset	1056

Mercurial > octave

annotate libinterp/corefcn/__ilu__.cc @ 20956:850e3d2533d4

annotate libinterp/corefcn/ilu.cc @ 20956:850e3d2533d4