octave-nkf: liboctave/numeric/CmplxQRP.cc annotate

annotate liboctave/numeric/CmplxQRP.cc @ 18883:aa9ca67f09fb

make all permutation matrices column permutations (bug #42418) Making all permutation matrices column permutations allows permutation matrices to be iterated over in column-major order just like any other matrix. * PermMatrix.h, PermMatrix.cc (PermMatrix::_colp): Delete member variable and all uses. (PermMatrix::transpose): Create new matrix with internal representation flipped. (PermMatrix::pos_power): New function. (PermMatrix::eye): Call the one-argument constructor which already defaults to the identity matrix. (PermMatrix::is_col_perm): Unconditionally return true. (PermMatrix::is_row_perm): Unconditionally return false. (PermMatrix::data, PermMatrix::fortran_vec, PermMatrix::pvec): Delete. (PermMatrix::col_perm_vec): New function. * lu.cc: New test. * base-lu.cc (base_lu<lu_type>::base_lu): Call transpose in ipvt initialization. * find.cc, kron.cc, pr-output.cc, ov-perm.cc, PermMatrix.cc, PermMatrix.h, Sparse.cc, dMatrix.cc, fMatrix.cc, CmplxQRP.cc, base-lu.cc, dbleQRP.cc, fCmplxQRP.cc, floatQRP.cc, Sparse-perm-op-defs.h, mx-op-defs.h: Adapt to PermMatrix changes.

author	David Spies <dnspies@gmail.com>
date	Wed, 18 Jun 2014 19:38:40 -0600
parents	49a5a4be04a1
children	4197fc428c7d

rev	line source
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	1 /*
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	2
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	3 Copyright (C) 1994-2013 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
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	5
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	7
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5307 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5307 diff changeset	11 option) any later version.
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	12
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	16 for more details.
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	17
8e134d3b21c9 [project @ 1994-07-21 22:40:04 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/>.
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	21
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	22 */
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	23
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	24 #ifdef HAVE_CONFIG_H
1192 b6360f2d4fa6 [project @ 1995-03-30 21:38:35 by jwe] jwe parents: 1011 diff changeset	25 #include <config.h>
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	26 #endif
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	27
1367 9f9131a8d706 [project @ 1995-09-06 00:07:03 by jwe] jwe parents: 1360 diff changeset	28 #include <cassert>
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	29
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	30 #include "CmplxQRP.h"
1847 2ffe49eb95a5 [project @ 1996-02-03 12:47:55 by jwe] jwe parents: 1367 diff changeset	31 #include "f77-fcn.h"
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	32 #include "lo-error.h"
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	33 #include "oct-locbuf.h"
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	34
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	35 extern "C"
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	36 {
4552 6f3382e08a52 [project @ 2003-10-27 20:38:02 by jwe] jwe parents: 4192 diff changeset	37 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10905 diff changeset	38 F77_FUNC (zgeqp3, ZGEQP3) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10905 diff changeset	39 Complex*, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10905 diff changeset	40 octave_idx_type, Complex, Complex*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10905 diff changeset	41 const octave_idx_type&, double*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10905 diff changeset	42 octave_idx_type&);
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	43 }
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	44
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	45 // It would be best to share some of this code with ComplexQR class...
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	46
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	47 ComplexQRP::ComplexQRP (const ComplexMatrix& a, qr_type_t qr_type)
2763 d9d00d7e271e [project @ 1997-03-01 02:14:33 by jwe] jwe parents: 2468 diff changeset	48 : ComplexQR (), p ()
d9d00d7e271e [project @ 1997-03-01 02:14:33 by jwe] jwe parents: 2468 diff changeset	49 {
d9d00d7e271e [project @ 1997-03-01 02:14:33 by jwe] jwe parents: 2468 diff changeset	50 init (a, qr_type);
d9d00d7e271e [project @ 1997-03-01 02:14:33 by jwe] jwe parents: 2468 diff changeset	51 }
d9d00d7e271e [project @ 1997-03-01 02:14:33 by jwe] jwe parents: 2468 diff changeset	52
d9d00d7e271e [project @ 1997-03-01 02:14:33 by jwe] jwe parents: 2468 diff changeset	53 void
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	54 ComplexQRP::init (const ComplexMatrix& a, qr_type_t qr_type)
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	55 {
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	56 assert (qr_type != qr_type_raw);
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	57
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	58 octave_idx_type m = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	59 octave_idx_type n = a.cols ();
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	60
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	61 octave_idx_type min_mn = m < n ? m : n;
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	62 OCTAVE_LOCAL_BUFFER (Complex, tau, min_mn);
1922 8a57554f3142 [project @ 1996-02-11 02:53:20 by jwe] jwe parents: 1882 diff changeset	63
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	64 octave_idx_type info = 0;
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	65
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	66 ComplexMatrix afact = a;
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	67 if (m > n && qr_type == qr_type_std)
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	68 afact.resize (m, m);
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	69
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	70 MArray<octave_idx_type> jpvt (dim_vector (n, 1), 0);
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	71
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	72 if (m > 0)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	73 {
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	74 OCTAVE_LOCAL_BUFFER (double, rwork, 2*n);
8368 c72c1c9bccdc call blocked permuted qr factorization routines from LAPACK Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	75
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	76 // workspace query.
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	77 Complex clwork;
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	78 F77_XFCN (zgeqp3, ZGEQP3, (m, n, afact.fortran_vec (),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	79 m, jpvt.fortran_vec (), tau,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	80 &clwork, -1, rwork, info));
8368 c72c1c9bccdc call blocked permuted qr factorization routines from LAPACK Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	81
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	82 // allocate buffer and do the job.
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8597 diff changeset	83 octave_idx_type lwork = clwork.real ();
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8597 diff changeset	84 lwork = std::max (lwork, static_cast<octave_idx_type> (1));
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	85 OCTAVE_LOCAL_BUFFER (Complex, work, lwork);
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	86 F77_XFCN (zgeqp3, ZGEQP3, (m, n, afact.fortran_vec (),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	87 m, jpvt.fortran_vec (), tau,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	88 work, lwork, rwork, info));
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	89 }
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	90 else
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	91 for (octave_idx_type i = 0; i < n; i++) jpvt(i) = i+1;
1922 8a57554f3142 [project @ 1996-02-11 02:53:20 by jwe] jwe parents: 1882 diff changeset	92
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	93 // Form Permutation matrix (if economy is requested, return the
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	94 // indices only!)
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	95
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8597 diff changeset	96 jpvt -= static_cast<octave_idx_type> (1);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	97 p = PermMatrix (jpvt, true);
1922 8a57554f3142 [project @ 1996-02-11 02:53:20 by jwe] jwe parents: 1882 diff changeset	98
8a57554f3142 [project @ 1996-02-11 02:53:20 by jwe] jwe parents: 1882 diff changeset	99
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8375 diff changeset	100 form (n, afact, tau, qr_type);
538 8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	101 }
8e134d3b21c9 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: diff changeset	102
10905 9ee5a0a1b93d Return permutation vector from QR as a row, not column, vector. Rik <octave@nomad.inbox5.com> parents: 10521 diff changeset	103 RowVector
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	104 ComplexQRP::Pvec (void) const
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	105 {
18883 aa9ca67f09fb make all permutation matrices column permutations (bug #42418) David Spies <dnspies@gmail.com> parents: 17769 diff changeset	106 Array<double> pa (p.col_perm_vec ());
10905 9ee5a0a1b93d Return permutation vector from QR as a row, not column, vector. Rik <octave@nomad.inbox5.com> parents: 10521 diff changeset	107 RowVector pv (MArray<double> (pa) + 1.0);
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	108 return pv;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	109 }

Mercurial > octave-nkf

annotate liboctave/numeric/CmplxQRP.cc @ 18883:aa9ca67f09fb