Mercurial > octave-antonio

annotate scripts/sparse/cgs.m @ 19700:00e31f316a3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix Matlab incompatibility of "ismatrix" (bug #42422). * data.cc (isvector): new tests * data.cc (isrow): documentation improved, new tests * data.cc (iscolumn): documentation improved, new tests * data.cc (ismatrix): is matrix now only checks the dimension due to Matlab compatibility, documentation improved, new tests * accumarray.m: use more appropriate function, than ismatrix * gradient.m: use more appropriate function, than ismatrix * num2str.m: use more appropriate functions, than ismatrix * ntsc2rgb.m: use more appropriate function, than ismatrix * condest.m: use more appropriate function, than ismatrix * expm.m: use more appropriate function, than ismatrix * onenormest.m: use more appropriate function, than ismatrix * isocolors.m: use more appropriate function, than ismatrix * isonormals.m: use more appropriate function, than ismatrix * isosurface.m: use more appropriate function, than ismatrix * __errcomm__.m: use more appropriate function, than ismatrix * __interp_cube__.m: use more appropriate function, than ismatrix * __marching_cube__.m: use more appropriate function, than ismatrix * __stem__.m: use more appropriate function, than ismatrix * stairs.m: use more appropriate function, than ismatrix * validsetargs.m: use more appropriate functions, than ismatrix * unique.m: use more appropriate functions, than ismatrix * bicg.m: additional tests for numerical value * bicgstab.m: additional tests for numerical value * cgs.m: additional tests for numerical value * gmres.m: additional tests for numerical value * qmr.m: additional tests for numerical value
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Thu, 12 Feb 2015 18:34:56 +0100
parents 4197fc428c7d
children 9fc020886ae9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
19697
4197fc428c7d maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents: 17744
diff changeset
1 ## Copyright (C) 2008-2015 Radek Salac
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 13929
diff changeset
2 ## Copyright (C) 2012 Carlo de Falco
8338
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
3 ##
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
4 ## This file is part of Octave.
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
5 ##
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
6 ## Octave is free software; you can redistribute it and/or modify it
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
7 ## under the terms of the GNU General Public License as published by
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
8 ## the Free Software Foundation; either version 3 of the License, or (at
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
9 ## your option) any later version.
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
10 ##
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
11 ## Octave is distributed in the hope that it will be useful, but
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
12 ## WITHOUT ANY WARRANTY; without even the implied warranty of
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
13 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
14 ## General Public License for more details.
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
15 ##
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
16 ## You should have received a copy of the GNU General Public License
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
17 ## along with Octave; see the file COPYING. If not, see
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
18 ## <http://www.gnu.org/licenses/>.
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
19
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
20 ## -*- texinfo -*-
13929
9cae456085c2 Grammarcheck of documentation before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents: 13141
diff changeset
21 ## @deftypefn {Function File} {@var{x} =} cgs (@var{A}, @var{b}, @var{rtol}, @var{maxit}, @var{M1}, @var{M2}, @var{x0})
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
22 ## @deftypefnx {Function File} {@var{x} =} cgs (@var{A}, @var{b}, @var{rtol}, @var{maxit}, @var{P})
13929
9cae456085c2 Grammarcheck of documentation before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents: 13141
diff changeset
23 ## @deftypefnx {Function File} {[@var{x}, @var{flag}, @var{relres}, @var{iter}, @var{resvec}] =} cgs (@var{A}, @var{b}, @dots{})
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
24 ## Solve @code{A x = b}, where @var{A} is a square matrix, using the
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
25 ## Conjugate Gradients Squared method.
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
26 ##
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
27 ## @itemize @minus
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
28 ## @item @var{rtol} is the relative tolerance, if not given or set to []
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
29 ## the default value 1e-6 is used.
13929
9cae456085c2 Grammarcheck of documentation before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents: 13141
diff changeset
30 ##
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
31 ## @item @var{maxit} the maximum number of outer iterations, if not
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
32 ## given or set to [] the default value @code{min (20, numel (b))} is
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
33 ## used.
13929
9cae456085c2 Grammarcheck of documentation before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents: 13141
diff changeset
34 ##
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
35 ## @item @var{x0} the initial guess, if not given or set to [] the
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
36 ## default value @code{zeros (size (b))} is used.
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
37 ## @end itemize
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
38 ##
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
39 ## @var{A} can be passed as a matrix or as a function handle or
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
40 ## inline function @code{f} such that @code{f(x) = A*x}.
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
41 ##
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
42 ## The preconditioner @var{P} is given as @code{P = M1 * M2}.
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
43 ## Both @var{M1} and @var{M2} can be passed as a matrix or as a function
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
44 ## handle or inline function @code{g} such that @code{g(x) = M1 \ x} or
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
45 ## @code{g(x) = M2 \ x}.
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
46 ##
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
47 ## If called with more than one output parameter
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
48 ##
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
49 ## @itemize @minus
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
50 ## @item @var{flag} indicates the exit status:
14853
72b8b39e12be doc: Periodic grammarcheck of documentation.
Rik <octave@nomad.inbox5.com>
parents: 14609
diff changeset
51 ##
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
52 ## @itemize @minus
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
53 ## @item 0: iteration converged to the within the chosen tolerance
13929
9cae456085c2 Grammarcheck of documentation before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents: 13141
diff changeset
54 ##
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
55 ## @item 1: the maximum number of iterations was reached before convergence
13929
9cae456085c2 Grammarcheck of documentation before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents: 13141
diff changeset
56 ##
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
57 ## @item 3: the algorithm reached stagnation
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
58 ## @end itemize
16816
12005245b645 doc: Periodic grammarcheck of documentation.
Rik <rik@octave.org>
parents: 14853
diff changeset
59 ##
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
60 ## (the value 2 is unused but skipped for compatibility).
13929
9cae456085c2 Grammarcheck of documentation before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents: 13141
diff changeset
61 ##
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
62 ## @item @var{relres} is the final value of the relative residual.
13929
9cae456085c2 Grammarcheck of documentation before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents: 13141
diff changeset
63 ##
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
64 ## @item @var{iter} is the number of iterations performed.
13929
9cae456085c2 Grammarcheck of documentation before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents: 13141
diff changeset
65 ##
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
66 ## @item @var{resvec} is a vector containing the relative residual at
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
67 ## each iteration.
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
68 ## @end itemize
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
69 ##
13929
9cae456085c2 Grammarcheck of documentation before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents: 13141
diff changeset
70 ## @seealso{pcg, bicgstab, bicg, gmres}
8338
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
71 ## @end deftypefn
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
72
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
73 function [x, flag, relres, iter, resvec] = cgs (A, b, tol, maxit, M1, M2, x0)
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
74
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
75 if (nargin >= 2 && nargin <= 7 && isvector (full (b)))
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
76
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
77 if (ischar (A))
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
78 A = str2func (A);
19700
00e31f316a3a Fix Matlab incompatibility of "ismatrix" (bug #42422).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 19697
diff changeset
79 elseif (isnumeric (A) && ismatrix (A))
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
80 Ax = @(x) A * x;
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
81 elseif (isa (A, "function_handle"))
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
82 Ax = @(x) feval (A, x);
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
83 else
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
84 error (["cgs: first argument is expected to "...
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
85 "be a function or a square matrix"]);
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
86 endif
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
87
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
88 if (nargin < 3 || isempty (tol))
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
89 tol = 1e-6;
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
90 endif
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
91
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
92 if (nargin < 4 || isempty (maxit))
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
93 maxit = min (rows (b), 20);
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
94 endif
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
95
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
96 if (nargin < 5 || isempty (M1))
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
97 M1m1x = @(x) x;
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
98 elseif (ischar (M1))
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
99 M1m1x = str2func (M1);
19700
00e31f316a3a Fix Matlab incompatibility of "ismatrix" (bug #42422).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 19697
diff changeset
100 elseif (isnumeric (M1) && ismatrix (M1))
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
101 M1m1x = @(x) M1 \ x;
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
102 elseif (isa (M1, "function_handle"))
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
103 M1m1x = @(x) feval (M1, x);
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
104 else
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
105 error ("cgs: preconditioner is expected to be a function or matrix");
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
106 endif
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
107
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
108 if (nargin < 6 || isempty (M2))
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
109 M2m1x = @(x) x;
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
110 elseif (ischar (M2))
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
111 M2m1x = str2func (M2);
19700
00e31f316a3a Fix Matlab incompatibility of "ismatrix" (bug #42422).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 19697
diff changeset
112 elseif (isnumeric (M2) && ismatrix (M2))
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
113 M2m1x = @(x) M2 \ x;
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
114 elseif (isa (M2, "function_handle"))
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
115 M2m1x = @(x) feval (M2, x);
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
116 else
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
117 error ("cgs: preconditioner is expected to be a function or matrix");
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
118 endif
8338
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
119
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
120 precon = @(x) M2m1x (M1m1x (x));
8338
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
121
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
122 if (nargin < 7 || isempty (x0))
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
123 x0 = zeros (size (b));
9279
1673a0dc019f fix & improve preconditioning strategy in cgs & bicgstab
Jaroslav Hajek <highegg@gmail.com>
parents: 9278
diff changeset
124 endif
8338
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
125
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
126
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
127 x = x0;
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
128
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
129 res = b - Ax (x);
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
130 norm_b = norm (b);
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
131 ## Vector of the residual norms for each iteration.
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
132 resvec = norm (res) / norm_b;
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
133 ro = 0;
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
134 ## Default behavior we don't reach tolerance tol within maxit iterations.
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
135 flag = 1;
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
136 for iter = 1:maxit
8338
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
137
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
138 z = precon (res);
8338
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
139
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
140 ## Cache.
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
141 ro_old = ro;
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
142 ro = res' * z;
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
143 if (iter == 1)
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
144 p = z;
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
145 else
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
146 beta = ro / ro_old;
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
147 p = z + beta * p;
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
148 endif
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
149 ## Cache.
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
150 q = Ax (p);
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
151 alpha = ro / (p' * q);
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
152 x = x + alpha * p;
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
153
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
154 res = res - alpha * q;
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
155 relres = norm (res) / norm_b;
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
156 resvec = [resvec; relres];
8338
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
157
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
158 if (relres <= tol)
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
159 ## We reach tolerance tol within maxit iterations.
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
160 flag = 0;
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
161 break
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
162 elseif (resvec (end) == resvec (end - 1))
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
163 ## The method stagnates.
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
164 flag = 3;
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
165 break
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
166 endif
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
167 endfor
8338
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
168
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
169 if (nargout < 1)
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
170 if (flag == 0)
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
171 printf ("cgs converged at iteration %i to a solution with relative residual %e\n",
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
172 iter, relres);
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
173 elseif (flag == 3)
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
174 printf (["cgs stopped at iteration %i without converging to the desired tolerance %e\n",
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
175 "because the method stagnated.\n",
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
176 "The iterate returned (number %i) has relative residual %e\n"],
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
177 iter, tol, iter, relres);
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
178 else
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
179 printf (["cgs stopped at iteration %i without converging to the desired tolerance %e\n",
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
180 "because the maximum number of iterations was reached.\n",
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
181 "The iterate returned (number %i) has relative residual %e\n"],
13077
1bf456b4e51c maint: style fixes for cgs
John W. Eaton <jwe@octave.org>
parents: 13076
diff changeset
182 iter, tol, iter, relres);
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
183 endif
9278
2b35cb600d50 improve bicgstab and cgs
Radek Salac <salac.r@gmail.com>
parents: 8920
diff changeset
184 endif
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
185
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
186 else
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
187 print_usage ();
9278
2b35cb600d50 improve bicgstab and cgs
Radek Salac <salac.r@gmail.com>
parents: 8920
diff changeset
188 endif
2b35cb600d50 improve bicgstab and cgs
Radek Salac <salac.r@gmail.com>
parents: 8920
diff changeset
189
8338
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
190 endfunction
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
191
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
192
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
193 %!demo
a35bf360b919 Add the cgs and treelayout functions
Radek Salac <salac.r@gmail.com>
parents:
diff changeset
194 %! % Solve system of A*x=b
14237
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
195 %! A = [5 -1 3;-1 2 -2;3 -2 3];
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
196 %! b = [7;-1;4];
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
197 %! [a,b,c,d,e] = cgs (A,b)
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
198
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
199 %!shared A, b, n, M
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
200 %!
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
201 %!test
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
202 %! n = 100;
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
203 %! A = spdiags ([-ones(n,1) 4*ones(n,1) -ones(n,1)], -1:1, n, n);
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
204 %! b = sum (A, 2);
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
205 %! tol = 1e-8;
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
206 %! maxit = 1000;
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
207 %! M = 4*eye (n);
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
208 %! [x, flag, relres, iter, resvec] = cgs (A, b, tol, maxit, M);
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
209 %! assert (x, ones (size (b)), 1e-7);
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
210 %!
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
211 %!test
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
212 %! tol = 1e-8;
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
213 %! maxit = 15;
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
214 %!
13076
59def8890992 codesprint: avoid crash after running tests
John W. Eaton <jwe@octave.org>
parents: 13063
diff changeset
215 %! [x, flag, relres, iter, resvec] = cgs (@(x) A * x, b, tol, maxit, M);
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
216 %! assert (x, ones (size (b)), 1e-7);
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
217
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
218 %!test
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
219 %! n = 100;
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
220 %! tol = 1e-8;
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
221 %! a = sprand (n, n, .1);
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
222 %! A = a'*a + 100 * eye (n);
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13077
diff changeset
223 %! b = sum (A, 2);
13063
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
224 %! [x, flag, relres, iter, resvec] = cgs (A, b, tol, [], diag (diag (A)));
4b110dd204b9 codesprint: Allow passing a function handle for the coefficient matrix in cgs
Carlo de Falco <kingcrimson@tiscali.it>
parents: 11587
diff changeset
225 %! assert (x, ones (size (b)), 1e-7);
14237
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
226