octave: liboctave/numeric/lu.cc annotate

annotate liboctave/numeric/lu.cc @ 23696:08036a7f3660

remove octave:: namespace tag from symbols used inside octave namespace * octave-gui.cc, dynamic-ld.h, ft-text-renderer.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, input.cc, input.h, interpreter.cc, load-path.cc, load-path.h, oct-stream.cc, sighandlers.cc, symtab.cc, symtab.h, __ode15__.cc, gzip.cc, octave.cc, lex.ll, oct-parse.in.yy, parse.h, pt-arg-list.cc, pt-arg-list.h, pt-array-list.h, pt-classdef.h, pt-decl.h, pt-eval.cc, pt-eval.h, pt-exp.h, pt-fcn-handle.cc, pt-idx.cc, pt-misc.h, pt-select.h, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt.cc, aepbalance.cc, chol.cc, gepbalance.cc, gsvd.cc, hess.cc, lo-mappers.h, lo-specfun.cc, lu.cc, qr.cc, qrp.cc, schur.cc, sparse-chol.cc, sparse-lu.cc, sparse-qr.cc, svd.cc, child-list.cc, dir-ops.cc, file-ops.cc, file-stat.cc, file-stat.h, lo-sysdep.cc, oct-env.cc, oct-syscalls.cc, cmd-edit.cc, cmd-hist.cc, oct-glob.cc, oct-locbuf.cc, oct-mutex.cc, oct-mutex.h, oct-shlib.cc, oct-shlib.h, pathsearch.cc, url-transfer.cc, url-transfer.h: Remove octave:: namespace tag from symbols used inside octave namespace. * oct-conf-post.in.h (OCTAVE_USE_DEPRECATED_FUNCTIONS): Don't define.

author	John W. Eaton <jwe@octave.org>
date	Mon, 26 Jun 2017 09:05:37 -0400
parents	d691ed308237
children	194eb4bd202b

rev	line source
1991 413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	1 /*
413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	2
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	3 Copyright (C) 1996-2017 John W. Eaton
10521 4d1fc073fbb7 add some missing copyright stmts Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	4 Copyright (C) 2009 VZLU Prague
1991 413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	5
413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	7
413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	9 under the terms of the GNU General Public License as published by
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	10 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	11 (at your option) any later version.
1991 413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	12
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	13 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	14 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	16 GNU General Public License for more details.
1991 413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	17
413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	18 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: 5307 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5307 diff changeset	20 <http://www.gnu.org/licenses/>.
1991 413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	21
413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	22 */
413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	23
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	24 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21271 diff changeset	25 # include "config.h"
1991 413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	26 #endif
413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	27
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	28 #include <algorithm>
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	29
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	30 #include "CColVector.h"
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	31 #include "CMatrix.h"
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	32 #include "PermMatrix.h"
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	33 #include "dColVector.h"
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	34 #include "dMatrix.h"
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	35 #include "fCColVector.h"
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	36 #include "fCMatrix.h"
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	37 #include "fColVector.h"
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	38 #include "fMatrix.h"
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	39 #include "lo-error.h"
22322 93b3cdd36854 move most f77 function decls to separate header files John W. Eaton <jwe@octave.org> parents: 22317 diff changeset	40 #include "lo-lapack-proto.h"
93b3cdd36854 move most f77 function decls to separate header files John W. Eaton <jwe@octave.org> parents: 22317 diff changeset	41 #include "lo-qrupdate-proto.h"
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	42 #include "lu.h"
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	43 #include "oct-locbuf.h"
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	44
22317 6ca3acf5fad8 move some new numeric classes to namespace octave::math John W. Eaton <jwe@octave.org> parents: 22135 diff changeset	45 namespace octave
6ca3acf5fad8 move some new numeric classes to namespace octave::math John W. Eaton <jwe@octave.org> parents: 22135 diff changeset	46 {
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	47 namespace math
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	48 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	49 template <typename T>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	50 lu<T>::lu (const T& l, const T& u,
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	51 const PermMatrix& p)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	52 : a_fact (u), l_fact (l), ipvt (p.transpose ().col_perm_vec ())
1991 413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	53 {
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	54 if (l.columns () != u.rows ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	55 (*current_liboctave_error_handler) ("lu: dimension mismatch");
1991 413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	56 }
413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	57
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	58 template <typename T>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	59 bool
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	60 lu<T>::packed (void) const
1991 413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	61 {
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	62 return l_fact.dims () == dim_vector ();
1991 413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	63 }
413f6a81868f [project @ 1996-03-03 00:40:53 by jwe] jwe parents: diff changeset	64
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	65 template <typename T>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	66 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	67 lu<T>::unpack (void)
13217 08ba694723f5 fix warnings for unused but set variables John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	68 {
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	69 if (packed ())
13217 08ba694723f5 fix warnings for unused but set variables John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	70 {
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	71 l_fact = L ();
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	72 a_fact = U (); // FIXME: sub-optimal
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	73 ipvt = getp ();
13217 08ba694723f5 fix warnings for unused but set variables John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	74 }
08ba694723f5 fix warnings for unused but set variables John W. Eaton <jwe@octave.org> parents: 11590 diff changeset	75 }
9715 9f27172fbd1e auto-set MatrixType from certain functions Jaroslav Hajek <highegg@gmail.com> parents: 9697 diff changeset	76
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	77 template <typename T>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	78 T
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	79 lu<T>::L (void) const
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	80 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	81 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	82 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	83 octave_idx_type a_nr = a_fact.rows ();
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	84 octave_idx_type a_nc = a_fact.columns ();
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	85 octave_idx_type mn = (a_nr < a_nc ? a_nr : a_nc);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	86
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	87 T l (a_nr, mn, ELT_T (0.0));
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	88
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	89 for (octave_idx_type i = 0; i < a_nr; i++)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	90 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	91 if (i < a_nc)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	92 l.xelem (i, i) = 1.0;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	93
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	94 for (octave_idx_type j = 0; j < (i < a_nc ? i : a_nc); j++)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	95 l.xelem (i, j) = a_fact.xelem (i, j);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	96 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	97
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	98 return l;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	99 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	100 else
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	101 return l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	102 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	103
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	104 template <typename T>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	105 T
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	106 lu<T>::U (void) const
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	107 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	108 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	109 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	110 octave_idx_type a_nr = a_fact.rows ();
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	111 octave_idx_type a_nc = a_fact.columns ();
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	112 octave_idx_type mn = (a_nr < a_nc ? a_nr : a_nc);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	113
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	114 T u (mn, a_nc, ELT_T (0.0));
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	115
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	116 for (octave_idx_type i = 0; i < mn; i++)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	117 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	118 for (octave_idx_type j = i; j < a_nc; j++)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	119 u.xelem (i, j) = a_fact.xelem (i, j);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	120 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	121
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	122 return u;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	123 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	124 else
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	125 return a_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	126 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	127
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	128 template <typename T>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	129 T
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	130 lu<T>::Y (void) const
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	131 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	132 if (! packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	133 (*current_liboctave_error_handler)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	134 ("lu: Y () not implemented for unpacked form");
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	135
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	136 return a_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	137 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	138
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	139 template <typename T>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	140 Array<octave_idx_type>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	141 lu<T>::getp (void) const
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	142 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	143 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	144 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	145 octave_idx_type a_nr = a_fact.rows ();
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	146
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	147 Array<octave_idx_type> pvt (dim_vector (a_nr, 1));
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	148
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	149 for (octave_idx_type i = 0; i < a_nr; i++)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	150 pvt.xelem (i) = i;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	151
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	152 for (octave_idx_type i = 0; i < ipvt.numel (); i++)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	153 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	154 octave_idx_type k = ipvt.xelem (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	155
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	156 if (k != i)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	157 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	158 octave_idx_type tmp = pvt.xelem (k);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	159 pvt.xelem (k) = pvt.xelem (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	160 pvt.xelem (i) = tmp;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	161 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	162 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	163
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	164 return pvt;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	165 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	166 else
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	167 return ipvt;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	168 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	169
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	170 template <typename T>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	171 PermMatrix
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	172 lu<T>::P (void) const
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	173 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	174 return PermMatrix (getp (), false);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	175 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	176
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	177 template <typename T>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	178 ColumnVector
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	179 lu<T>::P_vec (void) const
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	180 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	181 octave_idx_type a_nr = a_fact.rows ();
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	182
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	183 ColumnVector p (a_nr);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	184
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	185 Array<octave_idx_type> pvt = getp ();
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	186
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	187 for (octave_idx_type i = 0; i < a_nr; i++)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	188 p.xelem (i) = static_cast<double> (pvt.xelem (i) + 1);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	189
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	190 return p;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	191 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	192
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	193 template <typename T>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	194 bool
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	195 lu<T>::regular (void) const
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	196 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	197 bool retval = true;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	198
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	199 octave_idx_type k = std::min (a_fact.rows (), a_fact.columns ());
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	200
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	201 for (octave_idx_type i = 0; i < k; i++)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	202 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	203 if (a_fact(i, i) == ELT_T ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	204 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	205 retval = false;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	206 break;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	207 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	208 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	209
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	210 return retval;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	211 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	212
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	213 #if ! defined (HAVE_QRUPDATE_LUU)
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	214
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	215 template <typename T>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	216 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	217 lu<T>::update (const VT&, const VT&)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	218 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	219 (*current_liboctave_error_handler)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	220 ("luupdate: support for qrupdate with LU updates "
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	221 "was unavailable or disabled when liboctave was built");
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	222 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	223
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	224 template <typename T>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	225 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	226 lu<T>::update (const T&, const T&)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	227 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	228 (*current_liboctave_error_handler)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	229 ("luupdate: support for qrupdate with LU updates "
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	230 "was unavailable or disabled when liboctave was built");
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	231 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	232
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	233 template <typename T>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	234 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	235 lu<T>::update_piv (const VT&, const VT&)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	236 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	237 (*current_liboctave_error_handler)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	238 ("luupdate: support for qrupdate with LU updates "
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	239 "was unavailable or disabled when liboctave was built");
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	240 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	241
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	242 template <typename T>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	243 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	244 lu<T>::update_piv (const T&, const T&)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	245 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	246 (*current_liboctave_error_handler)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	247 ("luupdate: support for qrupdate with LU updates "
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	248 "was unavailable or disabled when liboctave was built");
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	249 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	250
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	251 #endif
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	252
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	253 // Specializations.
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	254
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	255 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	256 lu<Matrix>::lu (const Matrix& a)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	257 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	258 F77_INT a_nr = to_f77_int (a.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	259 F77_INT a_nc = to_f77_int (a.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	260 F77_INT mn = (a_nr < a_nc ? a_nr : a_nc);
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	261
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	262 ipvt.resize (dim_vector (mn, 1));
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	263 F77_INT *pipvt = ipvt.fortran_vec ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	264
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	265 a_fact = a;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	266 double *tmp_data = a_fact.fortran_vec ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	267
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	268 F77_INT info = 0;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	269
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	270 F77_XFCN (dgetrf, DGETRF, (a_nr, a_nc, tmp_data, a_nr, pipvt, info));
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	271
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	272 for (F77_INT i = 0; i < mn; i++)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	273 pipvt[i] -= 1;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	274 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	275
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	276 #if defined (HAVE_QRUPDATE_LUU)
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	277
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	278 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	279 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	280 lu<Matrix>::update (const ColumnVector& u, const ColumnVector& v)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	281 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	282 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	283 unpack ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	284
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	285 Matrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	286 Matrix& r = a_fact;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	287
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	288 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	289 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	290 F77_INT k = to_f77_int (l.columns ());
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	291
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	292 F77_INT u_nel = to_f77_int (u.numel ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	293 F77_INT v_nel = to_f77_int (v.numel ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	294
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	295 if (u_nel != m \|\| v_nel != n)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	296 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	297
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	298 ColumnVector utmp = u;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	299 ColumnVector vtmp = v;
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	300 F77_XFCN (dlu1up, DLU1UP, (m, n, l.fortran_vec (), m, r.fortran_vec (),
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	301 k, utmp.fortran_vec (), vtmp.fortran_vec ()));
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	302 }
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	303
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	304 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	305 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	306 lu<Matrix>::update (const Matrix& u, const Matrix& v)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	307 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	308 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	309 unpack ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	310
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	311 Matrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	312 Matrix& r = a_fact;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	313
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	314 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	315 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	316 F77_INT k = to_f77_int (l.columns ());
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	317
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	318 F77_INT u_nr = to_f77_int (u.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	319 F77_INT u_nc = to_f77_int (u.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	320
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	321 F77_INT v_nr = to_f77_int (v.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	322 F77_INT v_nc = to_f77_int (v.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	323
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	324 if (u_nr != m \|\| v_nr != n \|\| u_nc != v_nc)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	325 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	326
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	327 for (volatile F77_INT i = 0; i < u_nc; i++)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	328 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	329 ColumnVector utmp = u.column (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	330 ColumnVector vtmp = v.column (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	331 F77_XFCN (dlu1up, DLU1UP, (m, n, l.fortran_vec (),
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	332 m, r.fortran_vec (), k,
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	333 utmp.fortran_vec (), vtmp.fortran_vec ()));
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	334 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	335 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	336
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	337 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	338 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	339 lu<Matrix>::update_piv (const ColumnVector& u, const ColumnVector& v)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	340 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	341 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	342 unpack ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	343
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	344 Matrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	345 Matrix& r = a_fact;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	346
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	347 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	348 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	349 F77_INT k = to_f77_int (l.columns ());
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	350
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	351 F77_INT u_nel = to_f77_int (u.numel ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	352 F77_INT v_nel = to_f77_int (v.numel ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	353
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	354 if (u_nel != m \|\| v_nel != n)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	355 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	356
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	357 ColumnVector utmp = u;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	358 ColumnVector vtmp = v;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	359 OCTAVE_LOCAL_BUFFER (double, w, m);
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	360 for (F77_INT i = 0; i < m; i++) ipvt(i) += 1; // increment
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	361 F77_XFCN (dlup1up, DLUP1UP, (m, n, l.fortran_vec (),
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	362 m, r.fortran_vec (), k,
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	363 ipvt.fortran_vec (),
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	364 utmp.data (), vtmp.data (), w));
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	365 for (F77_INT i = 0; i < m; i++) ipvt(i) -= 1; // decrement
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	366 }
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	367
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	368 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	369 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	370 lu<Matrix>::update_piv (const Matrix& u, const Matrix& v)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	371 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	372 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	373 unpack ();
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	374
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	375 Matrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	376 Matrix& r = a_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	377
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	378 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	379 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	380 F77_INT k = to_f77_int (l.columns ());
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	381
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	382 F77_INT u_nr = to_f77_int (u.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	383 F77_INT u_nc = to_f77_int (u.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	384
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	385 F77_INT v_nr = to_f77_int (v.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	386 F77_INT v_nc = to_f77_int (v.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	387
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	388 if (u_nr != m \|\| v_nr != n \|\| u_nc != v_nc)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	389 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	390
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	391 OCTAVE_LOCAL_BUFFER (double, w, m);
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	392 for (F77_INT i = 0; i < m; i++) ipvt(i) += 1; // increment
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	393 for (volatile F77_INT i = 0; i < u_nc; i++)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	394 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	395 ColumnVector utmp = u.column (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	396 ColumnVector vtmp = v.column (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	397 F77_XFCN (dlup1up, DLUP1UP, (m, n, l.fortran_vec (),
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	398 m, r.fortran_vec (), k,
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	399 ipvt.fortran_vec (),
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	400 utmp.data (), vtmp.data (), w));
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	401 }
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	402 for (F77_INT i = 0; i < m; i++) ipvt(i) -= 1; // decrement
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	403 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	404
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	405 #endif
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	406
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	407 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	408 lu<FloatMatrix>::lu (const FloatMatrix& a)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	409 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	410 F77_INT a_nr = to_f77_int (a.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	411 F77_INT a_nc = to_f77_int (a.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	412 F77_INT mn = (a_nr < a_nc ? a_nr : a_nc);
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	413
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	414 ipvt.resize (dim_vector (mn, 1));
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	415 F77_INT *pipvt = ipvt.fortran_vec ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	416
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	417 a_fact = a;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	418 float *tmp_data = a_fact.fortran_vec ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	419
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	420 F77_INT info = 0;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	421
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	422 F77_XFCN (sgetrf, SGETRF, (a_nr, a_nc, tmp_data, a_nr, pipvt, info));
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	423
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	424 for (F77_INT i = 0; i < mn; i++)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	425 pipvt[i] -= 1;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	426 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	427
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	428 #if defined (HAVE_QRUPDATE_LUU)
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	429
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	430 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	431 void
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	432 lu<FloatMatrix>::update (const FloatColumnVector& u,
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	433 const FloatColumnVector& v)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	434 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	435 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	436 unpack ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	437
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	438 FloatMatrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	439 FloatMatrix& r = a_fact;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	440
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	441 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	442 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	443 F77_INT k = to_f77_int (l.columns ());
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	444
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	445 F77_INT u_nel = to_f77_int (u.numel ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	446 F77_INT v_nel = to_f77_int (v.numel ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	447
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	448 if (u_nel != m \|\| v_nel != n)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	449 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	450
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	451 FloatColumnVector utmp = u;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	452 FloatColumnVector vtmp = v;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	453 F77_XFCN (slu1up, SLU1UP, (m, n, l.fortran_vec (),
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	454 m, r.fortran_vec (), k,
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	455 utmp.fortran_vec (), vtmp.fortran_vec ()));
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	456 }
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	457
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	458 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	459 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	460 lu<FloatMatrix>::update (const FloatMatrix& u, const FloatMatrix& v)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	461 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	462 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	463 unpack ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	464
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	465 FloatMatrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	466 FloatMatrix& r = a_fact;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	467
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	468 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	469 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	470 F77_INT k = to_f77_int (l.columns ());
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	471
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	472 F77_INT u_nr = to_f77_int (u.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	473 F77_INT u_nc = to_f77_int (u.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	474
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	475 F77_INT v_nr = to_f77_int (v.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	476 F77_INT v_nc = to_f77_int (v.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	477
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	478 if (u_nr != m \|\| v_nr != n \|\| u_nc != v_nc)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	479 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	480
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	481 for (volatile F77_INT i = 0; i < u_nc; i++)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	482 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	483 FloatColumnVector utmp = u.column (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	484 FloatColumnVector vtmp = v.column (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	485 F77_XFCN (slu1up, SLU1UP, (m, n, l.fortran_vec (),
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	486 m, r.fortran_vec (), k,
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	487 utmp.fortran_vec (), vtmp.fortran_vec ()));
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	488 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	489 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	490
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	491 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	492 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	493 lu<FloatMatrix>::update_piv (const FloatColumnVector& u,
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	494 const FloatColumnVector& v)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	495 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	496 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	497 unpack ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	498
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	499 FloatMatrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	500 FloatMatrix& r = a_fact;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	501
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	502 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	503 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	504 F77_INT k = to_f77_int (l.columns ());
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	505
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	506 F77_INT u_nel = to_f77_int (u.numel ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	507 F77_INT v_nel = to_f77_int (v.numel ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	508
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	509 if (u_nel != m \|\| v_nel != n)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	510 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	511
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	512 FloatColumnVector utmp = u;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	513 FloatColumnVector vtmp = v;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	514 OCTAVE_LOCAL_BUFFER (float, w, m);
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	515 for (F77_INT i = 0; i < m; i++) ipvt(i) += 1; // increment
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	516 F77_XFCN (slup1up, SLUP1UP, (m, n, l.fortran_vec (),
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	517 m, r.fortran_vec (), k,
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	518 ipvt.fortran_vec (),
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	519 utmp.data (), vtmp.data (), w));
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	520 for (F77_INT i = 0; i < m; i++) ipvt(i) -= 1; // decrement
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	521 }
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	522
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	523 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	524 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	525 lu<FloatMatrix>::update_piv (const FloatMatrix& u, const FloatMatrix& v)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	526 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	527 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	528 unpack ();
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	529
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	530 FloatMatrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	531 FloatMatrix& r = a_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	532
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	533 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	534 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	535 F77_INT k = to_f77_int (l.columns ());
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	536
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	537 F77_INT u_nr = to_f77_int (u.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	538 F77_INT u_nc = to_f77_int (u.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	539
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	540 F77_INT v_nr = to_f77_int (v.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	541 F77_INT v_nc = to_f77_int (v.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	542
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	543 if (u_nr != m \|\| v_nr != n \|\| u_nc != v_nc)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	544 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	545
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	546 OCTAVE_LOCAL_BUFFER (float, w, m);
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	547 for (F77_INT i = 0; i < m; i++) ipvt(i) += 1; // increment
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	548 for (volatile F77_INT i = 0; i < u_nc; i++)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	549 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	550 FloatColumnVector utmp = u.column (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	551 FloatColumnVector vtmp = v.column (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	552 F77_XFCN (slup1up, SLUP1UP, (m, n, l.fortran_vec (),
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	553 m, r.fortran_vec (), k,
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	554 ipvt.fortran_vec (),
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	555 utmp.data (), vtmp.data (), w));
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	556 }
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	557 for (F77_INT i = 0; i < m; i++) ipvt(i) -= 1; // decrement
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	558 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	559
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	560 #endif
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	561
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	562 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	563 lu<ComplexMatrix>::lu (const ComplexMatrix& a)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	564 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	565 F77_INT a_nr = to_f77_int (a.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	566 F77_INT a_nc = to_f77_int (a.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	567 F77_INT mn = (a_nr < a_nc ? a_nr : a_nc);
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	568
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	569 ipvt.resize (dim_vector (mn, 1));
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	570 F77_INT *pipvt = ipvt.fortran_vec ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	571
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	572 a_fact = a;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	573 Complex *tmp_data = a_fact.fortran_vec ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	574
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	575 F77_INT info = 0;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	576
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	577 F77_XFCN (zgetrf, ZGETRF, (a_nr, a_nc, F77_DBLE_CMPLX_ARG (tmp_data),
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	578 a_nr, pipvt, info));
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	579
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	580 for (F77_INT i = 0; i < mn; i++)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	581 pipvt[i] -= 1;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	582 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	583
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	584 #if defined (HAVE_QRUPDATE_LUU)
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	585
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	586 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	587 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	588 lu<ComplexMatrix>::update (const ComplexColumnVector& u,
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	589 const ComplexColumnVector& v)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	590 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	591 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	592 unpack ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	593
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	594 ComplexMatrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	595 ComplexMatrix& r = a_fact;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	596
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	597 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	598 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	599 F77_INT k = to_f77_int (l.columns ());
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	600
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	601 F77_INT u_nel = to_f77_int (u.numel ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	602 F77_INT v_nel = to_f77_int (v.numel ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	603
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	604 if (u_nel != m \|\| v_nel != n)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	605 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	606
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	607 ComplexColumnVector utmp = u;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	608 ComplexColumnVector vtmp = v;
22402 4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22329 diff changeset	609 F77_XFCN (zlu1up, ZLU1UP, (m, n, F77_DBLE_CMPLX_ARG (l.fortran_vec ()), m,
4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22329 diff changeset	610 F77_DBLE_CMPLX_ARG (r.fortran_vec ()), k,
4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22329 diff changeset	611 F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()),
4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22329 diff changeset	612 F77_DBLE_CMPLX_ARG (vtmp.fortran_vec ())));
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	613 }
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	614
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	615 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	616 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	617 lu<ComplexMatrix>::update (const ComplexMatrix& u, const ComplexMatrix& v)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	618 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	619 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	620 unpack ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	621
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	622 ComplexMatrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	623 ComplexMatrix& r = a_fact;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	624
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	625 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	626 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	627 F77_INT k = to_f77_int (l.columns ());
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	628
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	629 F77_INT u_nr = to_f77_int (u.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	630 F77_INT u_nc = to_f77_int (u.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	631
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	632 F77_INT v_nr = to_f77_int (v.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	633 F77_INT v_nc = to_f77_int (v.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	634
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	635 if (u_nr != m \|\| v_nr != n \|\| u_nc != v_nc)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	636 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	637
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	638 for (volatile F77_INT i = 0; i < u_nc; i++)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	639 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	640 ComplexColumnVector utmp = u.column (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	641 ComplexColumnVector vtmp = v.column (i);
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	642 F77_XFCN (zlu1up, ZLU1UP, (m, n,
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	643 F77_DBLE_CMPLX_ARG (l.fortran_vec ()),
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	644 m, F77_DBLE_CMPLX_ARG (r.fortran_vec ()),
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	645 k,
22402 4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22329 diff changeset	646 F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()),
4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22329 diff changeset	647 F77_DBLE_CMPLX_ARG (vtmp.fortran_vec ())));
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	648 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	649 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	650
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	651 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	652 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	653 lu<ComplexMatrix>::update_piv (const ComplexColumnVector& u,
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	654 const ComplexColumnVector& v)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	655 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	656 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	657 unpack ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	658
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	659 ComplexMatrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	660 ComplexMatrix& r = a_fact;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	661
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	662 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	663 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	664 F77_INT k = to_f77_int (l.columns ());
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	665
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	666 F77_INT u_nel = to_f77_int (u.numel ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	667 F77_INT v_nel = to_f77_int (v.numel ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	668
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	669 if (u_nel != m \|\| v_nel != n)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	670 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	671
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	672 ComplexColumnVector utmp = u;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	673 ComplexColumnVector vtmp = v;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	674 OCTAVE_LOCAL_BUFFER (Complex, w, m);
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	675 for (F77_INT i = 0; i < m; i++) ipvt(i) += 1; // increment
22135 407c66ae1e20 reduce warnings from GCC's link-time optimization feature (bug #48531) John W. Eaton <jwe@octave.org> parents: 22133 diff changeset	676 F77_XFCN (zlup1up, ZLUP1UP, (m, n, F77_DBLE_CMPLX_ARG (l.fortran_vec ()),
407c66ae1e20 reduce warnings from GCC's link-time optimization feature (bug #48531) John W. Eaton <jwe@octave.org> parents: 22133 diff changeset	677 m, F77_DBLE_CMPLX_ARG (r.fortran_vec ()), k,
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	678 ipvt.fortran_vec (),
22402 4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22329 diff changeset	679 F77_CONST_DBLE_CMPLX_ARG (utmp.data ()),
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	680 F77_CONST_DBLE_CMPLX_ARG (vtmp.data ()),
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	681 F77_DBLE_CMPLX_ARG (w)));
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	682 for (F77_INT i = 0; i < m; i++) ipvt(i) -= 1; // decrement
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	683 }
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	684
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	685 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	686 void
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	687 lu<ComplexMatrix>::update_piv (const ComplexMatrix& u,
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	688 const ComplexMatrix& v)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	689 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	690 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	691 unpack ();
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	692
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	693 ComplexMatrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	694 ComplexMatrix& r = a_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	695
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	696 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	697 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	698 F77_INT k = to_f77_int (l.columns ());
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	699
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	700 F77_INT u_nr = to_f77_int (u.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	701 F77_INT u_nc = to_f77_int (u.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	702
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	703 F77_INT v_nr = to_f77_int (v.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	704 F77_INT v_nc = to_f77_int (v.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	705
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	706 if (u_nr != m \|\| v_nr != n \|\| u_nc != v_nc)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	707 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	708
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	709 OCTAVE_LOCAL_BUFFER (Complex, w, m);
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	710 for (F77_INT i = 0; i < m; i++) ipvt(i) += 1; // increment
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	711 for (volatile F77_INT i = 0; i < u_nc; i++)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	712 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	713 ComplexColumnVector utmp = u.column (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	714 ComplexColumnVector vtmp = v.column (i);
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	715 F77_XFCN (zlup1up, ZLUP1UP, (m, n,
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	716 F77_DBLE_CMPLX_ARG (l.fortran_vec ()),
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	717 m,
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	718 F77_DBLE_CMPLX_ARG (r.fortran_vec ()),
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	719 k, ipvt.fortran_vec (),
22402 4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22329 diff changeset	720 F77_CONST_DBLE_CMPLX_ARG (utmp.data ()),
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	721 F77_CONST_DBLE_CMPLX_ARG (vtmp.data ()),
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	722 F77_DBLE_CMPLX_ARG (w)));
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	723 }
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	724 for (F77_INT i = 0; i < m; i++) ipvt(i) -= 1; // decrement
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	725 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	726
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	727 #endif
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	728
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	729 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	730 lu<FloatComplexMatrix>::lu (const FloatComplexMatrix& a)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	731 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	732 F77_INT a_nr = to_f77_int (a.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	733 F77_INT a_nc = to_f77_int (a.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	734 F77_INT mn = (a_nr < a_nc ? a_nr : a_nc);
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	735
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	736 ipvt.resize (dim_vector (mn, 1));
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	737 F77_INT *pipvt = ipvt.fortran_vec ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	738
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	739 a_fact = a;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	740 FloatComplex *tmp_data = a_fact.fortran_vec ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	741
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	742 F77_INT info = 0;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	743
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	744 F77_XFCN (cgetrf, CGETRF, (a_nr, a_nc, F77_CMPLX_ARG (tmp_data), a_nr,
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	745 pipvt, info));
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	746
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	747 for (F77_INT i = 0; i < mn; i++)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	748 pipvt[i] -= 1;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	749 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	750
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	751 #if defined (HAVE_QRUPDATE_LUU)
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	752
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	753 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	754 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	755 lu<FloatComplexMatrix>::update (const FloatComplexColumnVector& u,
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	756 const FloatComplexColumnVector& v)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	757 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	758 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	759 unpack ();
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	760
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	761 FloatComplexMatrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	762 FloatComplexMatrix& r = a_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	763
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	764 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	765 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	766 F77_INT k = to_f77_int (l.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	767
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	768 F77_INT u_nel = to_f77_int (u.numel ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	769 F77_INT v_nel = to_f77_int (v.numel ());
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	770
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	771 if (u_nel != m \|\| v_nel != n)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	772 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	773
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	774 FloatComplexColumnVector utmp = u;
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	775 FloatComplexColumnVector vtmp = v;
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	776 F77_XFCN (clu1up, CLU1UP, (m, n, F77_CMPLX_ARG (l.fortran_vec ()), m,
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	777 F77_CMPLX_ARG (r.fortran_vec ()), k,
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	778 F77_CMPLX_ARG (utmp.fortran_vec ()),
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	779 F77_CMPLX_ARG (vtmp.fortran_vec ())));
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	780 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	781
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	782 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	783 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	784 lu<FloatComplexMatrix>::update (const FloatComplexMatrix& u,
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	785 const FloatComplexMatrix& v)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	786 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	787 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	788 unpack ();
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	789
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	790 FloatComplexMatrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	791 FloatComplexMatrix& r = a_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	792
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	793 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	794 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	795 F77_INT k = to_f77_int (l.columns ());
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	796
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	797 F77_INT u_nr = to_f77_int (u.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	798 F77_INT u_nc = to_f77_int (u.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	799
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	800 F77_INT v_nr = to_f77_int (v.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	801 F77_INT v_nc = to_f77_int (v.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	802
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	803 if (u_nr != m \|\| v_nr != n \|\| u_nc != v_nc)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	804 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	805
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	806 for (volatile F77_INT i = 0; i < u_nc; i++)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	807 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	808 FloatComplexColumnVector utmp = u.column (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	809 FloatComplexColumnVector vtmp = v.column (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	810 F77_XFCN (clu1up, CLU1UP, (m, n, F77_CMPLX_ARG (l.fortran_vec ()),
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	811 m, F77_CMPLX_ARG (r.fortran_vec ()), k,
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	812 F77_CMPLX_ARG (utmp.fortran_vec ()),
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	813 F77_CMPLX_ARG (vtmp.fortran_vec ())));
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	814 }
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	815 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	816
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	817 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	818 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	819 lu<FloatComplexMatrix>::update_piv (const FloatComplexColumnVector& u,
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	820 const FloatComplexColumnVector& v)
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	821 {
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	822 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	823 unpack ();
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	824
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	825 FloatComplexMatrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	826 FloatComplexMatrix& r = a_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	827
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	828 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	829 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	830 F77_INT k = to_f77_int (l.columns ());
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	831
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	832 F77_INT u_nel = to_f77_int (u.numel ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	833 F77_INT v_nel = to_f77_int (v.numel ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	834
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	835 if (u_nel != m \|\| v_nel != n)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	836 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	837
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	838 FloatComplexColumnVector utmp = u;
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	839 FloatComplexColumnVector vtmp = v;
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	840 OCTAVE_LOCAL_BUFFER (FloatComplex, w, m);
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	841 for (F77_INT i = 0; i < m; i++) ipvt(i) += 1; // increment
22135 407c66ae1e20 reduce warnings from GCC's link-time optimization feature (bug #48531) John W. Eaton <jwe@octave.org> parents: 22133 diff changeset	842 F77_XFCN (clup1up, CLUP1UP, (m, n, F77_CMPLX_ARG (l.fortran_vec ()),
407c66ae1e20 reduce warnings from GCC's link-time optimization feature (bug #48531) John W. Eaton <jwe@octave.org> parents: 22133 diff changeset	843 m, F77_CMPLX_ARG (r.fortran_vec ()), k,
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	844 ipvt.fortran_vec (),
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	845 F77_CONST_CMPLX_ARG (utmp.data ()),
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	846 F77_CONST_CMPLX_ARG (vtmp.data ()),
22402 4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22329 diff changeset	847 F77_CMPLX_ARG (w)));
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	848 for (F77_INT i = 0; i < m; i++) ipvt(i) -= 1; // decrement
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	849 }
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	850
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	851 template <>
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	852 void
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	853 lu<FloatComplexMatrix>::update_piv (const FloatComplexMatrix& u,
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	854 const FloatComplexMatrix& v)
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	855 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	856 if (packed ())
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	857 unpack ();
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	858
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	859 FloatComplexMatrix& l = l_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	860 FloatComplexMatrix& r = a_fact;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	861
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	862 F77_INT m = to_f77_int (l.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	863 F77_INT n = to_f77_int (r.columns ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	864 F77_INT k = to_f77_int (l.columns ());
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	865
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	866 F77_INT u_nr = to_f77_int (u.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	867 F77_INT u_nc = to_f77_int (u.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	868
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	869 F77_INT v_nr = to_f77_int (v.rows ());
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23475 diff changeset	870 F77_INT v_nc = to_f77_int (v.columns ());
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	871
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	872 if (u_nr != m \|\| v_nr != n \|\| u_nc != v_nc)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	873 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	874
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	875 OCTAVE_LOCAL_BUFFER (FloatComplex, w, m);
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	876 for (F77_INT i = 0; i < m; i++) ipvt(i) += 1; // increment
e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	877 for (volatile F77_INT i = 0; i < u_nc; i++)
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	878 {
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	879 FloatComplexColumnVector utmp = u.column (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	880 FloatComplexColumnVector vtmp = v.column (i);
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	881 F77_XFCN (clup1up, CLUP1UP, (m, n, F77_CMPLX_ARG (l.fortran_vec ()),
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	882 m, F77_CMPLX_ARG (r.fortran_vec ()), k,
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	883 ipvt.fortran_vec (),
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	884 F77_CONST_CMPLX_ARG (utmp.data ()),
d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23220 diff changeset	885 F77_CONST_CMPLX_ARG (vtmp.data ()),
22402 4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22329 diff changeset	886 F77_CMPLX_ARG (w)));
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	887 }
22846 e827d2c089f4 use F77_INT instead of octave_idx_type for liboctave Quad and lu classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	888 for (F77_INT i = 0; i < m; i++) ipvt(i) -= 1; // decrement
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	889 }
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	890
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	891 #endif
7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	892
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	893 // Instantiations we need.
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	894
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	895 template class lu<Matrix>;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	896
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	897 template class lu<FloatMatrix>;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	898
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	899 template class lu<ComplexMatrix>;
21271 7e67c7f82fc1 better use of templates for lu factorization classes John W. Eaton <jwe@octave.org> parents: 21202 diff changeset	900
22329 7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	901 template class lu<FloatComplexMatrix>;
7f3c7a8bd131 maint: Indent namespaces in liboctave/numeric files. John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	902 }
22317 6ca3acf5fad8 move some new numeric classes to namespace octave::math John W. Eaton <jwe@octave.org> parents: 22135 diff changeset	903 }

Mercurial > octave

annotate liboctave/numeric/lu.cc @ 23696:08036a7f3660