octave: liboctave/numeric/lu.cc annotate

annotate liboctave/numeric/lu.cc @ 23220:092078913d54

maint: Merge stable to default.

author	John W. Eaton <jwe@octave.org>
date	Wed, 22 Feb 2017 12:58:07 -0500
parents	ef4d915df748 3ac9f9ecfae5
children	d691ed308237

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

Mercurial > octave

annotate liboctave/numeric/lu.cc @ 23220:092078913d54