octave-nkf: src/DLD-FUNCTIONS/luinc.cc annotate

annotate src/DLD-FUNCTIONS/luinc.cc @ 11586:12df7854fa7c

strip trailing whitespace from source files

author	John W. Eaton <jwe@octave.org>
date	Thu, 20 Jan 2011 17:24:59 -0500
parents	01f703952eff
children	1577c6f80926

rev	line source
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	1 /*
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	2
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11053 diff changeset	3 Copyright (C) 2005-2011 David Bateman
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	4
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	5 This file is part of Octave.
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	6
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	8 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	10 option) any later version.
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	11
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	15 for more details.
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	16
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	19 <http://www.gnu.org/licenses/>.
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	20
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	21 */
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	22
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	23 #ifdef HAVE_CONFIG_H
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	24 #include <config.h>
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	25 #endif
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	26
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	27 #include "defun-dld.h"
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	28 #include "error.h"
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	29 #include "gripes.h"
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	30 #include "oct-obj.h"
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	31 #include "utils.h"
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	32 #include "oct-map.h"
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	33
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5775 diff changeset	34 #include "MatrixType.h"
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	35 #include "SparseCmplxLU.h"
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	36 #include "SparsedbleLU.h"
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	37 #include "ov-re-sparse.h"
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	38 #include "ov-cx-sparse.h"
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	39
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	40 DEFUN_DLD (luinc, args, nargout,
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	41 "-- texinfo --\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	42 @deftypefn {Loadable Function} {[@var{L}, @var{U}, @var{P}, @var{Q}] =} luinc (@var{A}, '0')\n\
01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	43 @deftypefnx {Loadable Function} {[@var{L}, @var{U}, @var{P}, @var{Q}] =} luinc (@var{A}, @var{droptol})\n\
01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	44 @deftypefnx {Loadable Function} {[@var{L}, @var{U}, @var{P}, @var{Q}] =} luinc (@var{A}, @var{opts})\n\
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	45 @cindex LU decomposition\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	46 Produce the incomplete LU factorization of the sparse matrix @var{A}.\n\
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	47 Two types of incomplete factorization are possible, and the type\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	48 is determined by the second argument to @code{luinc}.\n\
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	49 \n\
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	50 Called with a second argument of '0', the zero-level incomplete\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	51 LU@tie{}factorization is produced. This creates a factorization of @var{A}\n\
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	52 where the position of the non-zero arguments correspond to the same\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	53 positions as in the matrix @var{A}.\n\
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	54 \n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	55 Alternatively, the fill-in of the incomplete LU@tie{}factorization can\n\
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	56 be controlled through the variable @var{droptol} or the structure\n\
10711 fbd7843974fa Periodic grammar check of documentation files to ensure common format. Rik <octave@nomad.inbox5.com> parents: 10155 diff changeset	57 @var{opts}. The @sc{umfpack} multifrontal factorization code by Tim A.\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	58 Davis is used for the incomplete LU@tie{}factorization, (availability\n\
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	59 @url{http://www.cise.ufl.edu/research/sparse/umfpack/})\n\
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	60 \n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	61 @var{droptol} determines the values below which the values in the\n\
01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	62 LU@tie{} factorization are dropped and replaced by zero. It must be a\n\
01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	63 positive scalar, and any values in the factorization whose absolute value\n\
01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	64 are less than this value are dropped, expect if leaving them increase the\n\
01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	65 sparsity of the matrix. Setting @var{droptol} to zero results in a complete\n\
01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	66 LU@tie{}factorization which is the default.\n\
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	67 \n\
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	68 @var{opts} is a structure containing one or more of the fields\n\
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	69 \n\
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	70 @table @code\n\
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	71 @item droptol\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	72 The drop tolerance as above. If @var{opts} only contains @code{droptol}\n\
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	73 then this is equivalent to using the variable @var{droptol}.\n\
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	74 \n\
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	75 @item milu\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	76 A logical variable flagging whether to use the modified incomplete\n\
01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	77 LU@tie{} factorization. In the case that @code{milu} is true, the dropped\n\
01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	78 values are subtracted from the diagonal of the matrix @var{U} of the\n\
01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	79 factorization. The default is @code{false}.\n\
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	80 \n\
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	81 @item udiag\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	82 A logical variable that flags whether zero elements on the diagonal of\n\
01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	83 @var{U} should be replaced with @var{droptol} to attempt to avoid singular\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	84 factors. The default is @code{false}.\n\
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	85 \n\
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	86 @item thresh\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	87 Defines the pivot threshold in the interval [0,1]. Values outside that\n\
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	88 range are ignored.\n\
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	89 @end table\n\
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	90 \n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	91 All other fields in @var{opts} are ignored. The outputs from @code{luinc}\n\
01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	92 are the same as for @code{lu}.\n\
7515 f3c00dc0912b Eliminate the rest of the dispatched sparse functions David Bateman <dbateman@free.fr> parents: 7243 diff changeset	93 \n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	94 Given the string argument 'vector', @code{luinc} returns the values of\n\
01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	95 @var{p} @var{q} as vector values.\n\
8286 6f2d95255911 fix @seealso references to point to existing anchors Thorsten Meyer <thorsten.meyier@gmx.de> parents: 7515 diff changeset	96 @seealso{sparse, lu}\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5610 diff changeset	97 @end deftypefn")
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	98 {
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	99 int nargin = args.length ();
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	100 octave_value_list retval;
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	101
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	102 if (nargin == 0)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5785 diff changeset	103 print_usage ();
7515 f3c00dc0912b Eliminate the rest of the dispatched sparse functions David Bateman <dbateman@free.fr> parents: 7243 diff changeset	104 else if (nargin < 2 \|\| nargin > 3)
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	105 error ("luinc: incorrect number of arguments");
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	106 else
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	107 {
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	108 bool zero_level = false;
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	109 bool milu = false;
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	110 bool udiag = false;
7515 f3c00dc0912b Eliminate the rest of the dispatched sparse functions David Bateman <dbateman@free.fr> parents: 7243 diff changeset	111 Matrix thresh;
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	112 double droptol = -1.;
7515 f3c00dc0912b Eliminate the rest of the dispatched sparse functions David Bateman <dbateman@free.fr> parents: 7243 diff changeset	113 bool vecout;
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	114
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	115 if (args(1).is_string ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	116 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	117 if (args(1).string_value () == "0")
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	118 zero_level = true;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	119 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	120 error ("luinc: unrecognized string argument");
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	121 }
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	122 else if (args(1).is_map ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	123 {
11049 b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	124 octave_scalar_map map = args(1).scalar_map_value ();
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	125
11049 b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	126 if (! error_state)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	127 {
11049 b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	128 octave_value tmp;
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	129
11053 c33b7054f1f9 in recent Octave_map -> octave_scalar_map changes, use GETFIELD to access map elements, not CONTENTS John W. Eaton <jwe@octave.org> parents: 11049 diff changeset	130 tmp = map.getfield ("droptol");
11049 b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	131 if (tmp.is_defined ())
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	132 droptol = tmp.double_value ();
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	133
11053 c33b7054f1f9 in recent Octave_map -> octave_scalar_map changes, use GETFIELD to access map elements, not CONTENTS John W. Eaton <jwe@octave.org> parents: 11049 diff changeset	134 tmp = map.getfield ("milu");
11049 b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	135 if (tmp.is_defined ())
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	136 {
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	137 double val = tmp.double_value ();
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	138
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	139 milu = (val == 0. ? false : true);
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	140 }
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	141
11053 c33b7054f1f9 in recent Octave_map -> octave_scalar_map changes, use GETFIELD to access map elements, not CONTENTS John W. Eaton <jwe@octave.org> parents: 11049 diff changeset	142 tmp = map.getfield ("udiag");
11049 b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	143 if (tmp.is_defined ())
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	144 {
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	145 double val = tmp.double_value ();
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	146
11049 b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	147 udiag = (val == 0. ? false : true);
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	148 }
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	149
11053 c33b7054f1f9 in recent Octave_map -> octave_scalar_map changes, use GETFIELD to access map elements, not CONTENTS John W. Eaton <jwe@octave.org> parents: 11049 diff changeset	150 tmp = map.getfield ("thresh");
11049 b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	151 if (tmp.is_defined ())
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	152 {
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	153 thresh = tmp.matrix_value ();
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	154
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	155 if (thresh.nelem () == 1)
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	156 {
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	157 thresh.resize(1,2);
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	158 thresh(1) = thresh(0);
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	159 }
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	160 else if (thresh.nelem () != 2)
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	161 {
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	162 error ("luinc: expecting 2-element vector for thresh");
11049 b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	163 return retval;
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	164 }
b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	165 }
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	166 }
11049 b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	167 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	168 {
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	169 error ("luinc: OPTS must be a scalar structure");
11049 b0a9450d81c6 luinc.cc: use octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	170 return retval;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	171 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	172 }
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	173 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	174 droptol = args(1).double_value ();
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	175
7515 f3c00dc0912b Eliminate the rest of the dispatched sparse functions David Bateman <dbateman@free.fr> parents: 7243 diff changeset	176 if (nargin == 3)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	177 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	178 std::string tmp = args(2).string_value ();
7515 f3c00dc0912b Eliminate the rest of the dispatched sparse functions David Bateman <dbateman@free.fr> parents: 7243 diff changeset	179
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	180 if (! error_state )
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	181 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	182 if (tmp.compare ("vector") == 0)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	183 vecout = true;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	184 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	185 error ("luinc: unrecognized string argument");
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	186 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	187 }
7515 f3c00dc0912b Eliminate the rest of the dispatched sparse functions David Bateman <dbateman@free.fr> parents: 7243 diff changeset	188
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5681 diff changeset	189 // FIXME Add code for zero-level factorization
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	190 if (zero_level)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	191 error ("luinc: zero-level factorization not implemented");
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	192
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	193 if (!error_state)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	194 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	195 if (args(0).type_name () == "sparse matrix")
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	196 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	197 SparseMatrix sm = args(0).sparse_matrix_value ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	198 octave_idx_type sm_nr = sm.rows ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	199 octave_idx_type sm_nc = sm.cols ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	200 ColumnVector Qinit (sm_nc);
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	201
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	202 for (octave_idx_type i = 0; i < sm_nc; i++)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	203 Qinit (i) = i;
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	204
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	205 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	206 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	207 switch (nargout)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	208 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	209 case 0:
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	210 case 1:
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	211 case 2:
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	212 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	213 SparseLU fact (sm, Qinit, thresh, false, true, droptol,
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	214 milu, udiag);
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	215
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	216 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	217 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	218 SparseMatrix P = fact.Pr ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	219 SparseMatrix L = P.transpose () * fact.L ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	220 retval(1) = octave_value (fact.U (),
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	221 MatrixType (MatrixType::Upper));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	222 retval(0) = octave_value (L, MatrixType
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	223 (MatrixType::Permuted_Lower,
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	224 sm_nr, fact.row_perm ()));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	225 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	226 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	227 break;
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	228
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	229 case 3:
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	230 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	231 SparseLU fact (sm, Qinit, thresh, false, true, droptol,
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	232 milu, udiag);
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	233
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	234 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	235 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	236 if (vecout)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	237 retval(2) = fact.Pr_vec ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	238 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	239 retval(2) = fact.Pr ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	240 retval(1) = octave_value (fact.U (),
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	241 MatrixType (MatrixType::Upper));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	242 retval(0) = octave_value (fact.L (),
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	243 MatrixType (MatrixType::Lower));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	244 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	245 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	246 break;
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	247
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	248 case 4:
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	249 default:
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	250 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	251 SparseLU fact (sm, Qinit, thresh, false, false, droptol,
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	252 milu, udiag);
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	253
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	254 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	255 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	256 if (vecout)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	257 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	258 retval(3) = fact.Pc_vec ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	259 retval(2) = fact.Pr_vec ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	260 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	261 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	262 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	263 retval(3) = fact.Pc ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	264 retval(2) = fact.Pr ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	265 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	266 retval(1) = octave_value (fact.U (),
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	267 MatrixType (MatrixType::Upper));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	268 retval(0) = octave_value (fact.L (),
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	269 MatrixType (MatrixType::Lower));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	270 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	271 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	272 break;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	273 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	274 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	275 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	276 else if (args(0).type_name () == "sparse complex matrix")
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	277 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	278 SparseComplexMatrix sm =
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	279 args(0).sparse_complex_matrix_value ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	280 octave_idx_type sm_nr = sm.rows ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	281 octave_idx_type sm_nc = sm.cols ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	282 ColumnVector Qinit (sm_nc);
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	283
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	284 for (octave_idx_type i = 0; i < sm_nc; i++)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	285 Qinit (i) = i;
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	286
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	287 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	288 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	289 switch (nargout)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	290 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	291 case 0:
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	292 case 1:
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	293 case 2:
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	294 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	295 SparseComplexLU fact (sm, Qinit, thresh, false, true,
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	296 droptol, milu, udiag);
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	297
6027 068e52f1c005 [project @ 2006-10-03 20:07:56 by jwe] jwe parents: 5823 diff changeset	298
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	299 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	300 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	301 SparseMatrix P = fact.Pr ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	302 SparseComplexMatrix L = P.transpose () * fact.L ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	303 retval(1) = octave_value (fact.U (),
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	304 MatrixType (MatrixType::Upper));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	305 retval(0) = octave_value (L, MatrixType
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	306 (MatrixType::Permuted_Lower,
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	307 sm_nr, fact.row_perm ()));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	308 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	309 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	310 break;
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	311
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	312 case 3:
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	313 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	314 SparseComplexLU fact (sm, Qinit, thresh, false, true,
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	315 droptol, milu, udiag);
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	316
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	317 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	318 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	319 if (vecout)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	320 retval(2) = fact.Pr_vec ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	321 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	322 retval(2) = fact.Pr ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	323 retval(1) = octave_value (fact.U (),
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	324 MatrixType (MatrixType::Upper));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	325 retval(0) = octave_value (fact.L (),
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	326 MatrixType (MatrixType::Lower));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	327 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	328 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	329 break;
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	330
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	331 case 4:
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	332 default:
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	333 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	334 SparseComplexLU fact (sm, Qinit, thresh, false, false,
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	335 droptol, milu, udiag);
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	336
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	337 if (! error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	338 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	339 if (vecout)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	340 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	341 retval(3) = fact.Pc_vec ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	342 retval(2) = fact.Pr_vec ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	343 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	344 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	345 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	346 retval(3) = fact.Pc ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	347 retval(2) = fact.Pr ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	348 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	349 retval(1) = octave_value (fact.U (),
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	350 MatrixType (MatrixType::Upper));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	351 retval(0) = octave_value (fact.L (),
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	352 MatrixType (MatrixType::Lower));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	353 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	354 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	355 break;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	356 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	357 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	358 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	359 else
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	360 error ("luinc: matrix A must be sparse");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9064 diff changeset	361 }
5282 5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	362 }
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	363
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	364 return retval;
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	365 }
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	366
5bdc3f24cd5f [project @ 2005-04-14 22:17:26 by dbateman] dbateman parents: diff changeset	367 /*
5610 9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	368
7243 e8d7eed42935 [project @ 2007-12-04 02:10:17 by jwe] jwe parents: 7017 diff changeset	369 %!testif HAVE_UMFPACK
5610 9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	370 %! a=sparse([1,2,0,0;0,1,2,0;1e-14,0,3,0;0,0,0,1]);
9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	371 %! [l,u]=luinc(a,1e-10);
9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	372 %! assert(l*u, sparse([1,2,0,0;0,1,2,0;0,0,3,0;0,0,0,1]),1e-10);
9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	373 %! opts.droptol=1e-10;
9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	374 %! [l,u]=luinc(a,opts);
9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	375 %! assert(l*u, sparse([1,2,0,0;0,1,2,0;0,0,3,0;0,0,0,1]),1e-10);
9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	376
7243 e8d7eed42935 [project @ 2007-12-04 02:10:17 by jwe] jwe parents: 7017 diff changeset	377 %!testif HAVE_UMFPACK
5610 9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	378 %! a=sparse([1i,2,0,0;0,1,2,0;1e-14,0,3,0;0,0,0,1]);
9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	379 %! [l,u]=luinc(a,1e-10);
9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	380 %! assert(l*u, sparse([1i,2,0,0;0,1,2,0;0,0,3,0;0,0,0,1]),1e-10);
9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	381 %! opts.droptol=1e-10;
9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	382 %! [l,u]=luinc(a,opts);
9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	383 %! assert(l*u, sparse([1i,2,0,0;0,1,2,0;0,0,3,0;0,0,0,1]),1e-10);
9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	384
9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5322 diff changeset	385 */

Mercurial > octave-nkf

annotate src/DLD-FUNCTIONS/luinc.cc @ 11586:12df7854fa7c