octave-nkf: liboctave/dbleQR.cc annotate

annotate liboctave/dbleQR.cc @ 11518:141b3fb5cef7

style fixes

author	John W. Eaton <jwe@octave.org>
date	Thu, 13 Jan 2011 16:52:30 -0500
parents	07ebe522dac2
children	fd0a3ac60b0e

rev	line source
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	1 /*
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	2
7017 a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	3 Copyright (C) 1994, 1995, 1996, 1997, 2002, 2003, 2004, 2005, 2007
a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	4 John W. Eaton
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	5 Copyright (C) 2008, 2009 Jaroslav Hajek
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	6 Copyright (C) 2009 VZLU Prague
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	7
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	8 This file is part of Octave.
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	9
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	10 Octave is free software; you can redistribute it and/or modify it
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	11 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	12 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	13 option) any later version.
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	14
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	15 Octave is distributed in the hope that it will be useful, but WITHOUT
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	18 for more details.
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	19
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	20 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	21 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	22 <http://www.gnu.org/licenses/>.
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	23
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	24 */
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	25
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	26 #ifdef HAVE_CONFIG_H
1192 b6360f2d4fa6 [project @ 1995-03-30 21:38:35 by jwe] jwe parents: 1011 diff changeset	27 #include <config.h>
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	28 #endif
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	29
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	30 #include "dbleQR.h"
1847 2ffe49eb95a5 [project @ 1996-02-03 12:47:55 by jwe] jwe parents: 1368 diff changeset	31 #include "f77-fcn.h"
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	32 #include "lo-error.h"
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	33 #include "Range.h"
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	34 #include "idx-vector.h"
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	35 #include "oct-locbuf.h"
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	36
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	37 #include "base-qr.cc"
7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	38
7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	39 template class base_qr<Matrix>;
7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	40
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	41 extern "C"
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	42 {
4552 6f3382e08a52 [project @ 2003-10-27 20:38:02 by jwe] jwe parents: 4192 diff changeset	43 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	44 F77_FUNC (dgeqrf, DGEQRF) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	45 double, const octave_idx_type&, double,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	46 double*, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	47 octave_idx_type&);
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	48
4552 6f3382e08a52 [project @ 2003-10-27 20:38:02 by jwe] jwe parents: 4192 diff changeset	49 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	50 F77_FUNC (dorgqr, DORGQR) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	51 const octave_idx_type&, double*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	52 const octave_idx_type&, double, double,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	53 const octave_idx_type&, octave_idx_type&);
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	54
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	55 #ifdef HAVE_QRUPDATE
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	56
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	57 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	58 F77_FUNC (dqr1up, DQR1UP) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	59 const octave_idx_type&, double*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	60 const octave_idx_type&, double*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	61 const octave_idx_type&, double, double, double*);
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	62
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	63 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	64 F77_FUNC (dqrinc, DQRINC) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	65 const octave_idx_type&, double*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	66 const octave_idx_type&, double*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	67 const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	68 const double, double);
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	69
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	70 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	71 F77_FUNC (dqrdec, DQRDEC) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	72 const octave_idx_type&, double*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	73 const octave_idx_type&, double*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	74 const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	75 double*);
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	76
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	77 F77_RET_T
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	78 F77_FUNC (dqrinr, DQRINR) (const octave_idx_type&, const octave_idx_type&,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	79 double, const octave_idx_type&, double,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	80 const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	81 const double, double);
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	82
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	83 F77_RET_T
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	84 F77_FUNC (dqrder, DQRDER) (const octave_idx_type&, const octave_idx_type&,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	85 double, const octave_idx_type&, double,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	86 const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	87 double*);
7700 efccca5f2ad7 more QR & Cholesky updating functions Jaroslav Hajek <highegg@gmail.com> parents: 7560 diff changeset	88
efccca5f2ad7 more QR & Cholesky updating functions Jaroslav Hajek <highegg@gmail.com> parents: 7560 diff changeset	89 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	90 F77_FUNC (dqrshc, DQRSHC) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	91 const octave_idx_type&, double*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	92 const octave_idx_type&, double*,
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	93 const octave_idx_type&, const octave_idx_type&,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	94 const octave_idx_type&, double*);
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	95
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	96 #endif
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	97 }
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	98
9734 1a9508872af0 initialize QR:: constants Jaroslav Hajek <highegg@gmail.com> parents: 9713 diff changeset	99 const QR::type QR::raw, QR::std, QR::economy;
1a9508872af0 initialize QR:: constants Jaroslav Hajek <highegg@gmail.com> parents: 9713 diff changeset	100
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	101 QR::QR (const Matrix& a, qr_type_t qr_type)
2763 d9d00d7e271e [project @ 1997-03-01 02:14:33 by jwe] jwe parents: 2244 diff changeset	102 {
d9d00d7e271e [project @ 1997-03-01 02:14:33 by jwe] jwe parents: 2244 diff changeset	103 init (a, qr_type);
d9d00d7e271e [project @ 1997-03-01 02:14:33 by jwe] jwe parents: 2244 diff changeset	104 }
d9d00d7e271e [project @ 1997-03-01 02:14:33 by jwe] jwe parents: 2244 diff changeset	105
d9d00d7e271e [project @ 1997-03-01 02:14:33 by jwe] jwe parents: 2244 diff changeset	106 void
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	107 QR::init (const Matrix& a, qr_type_t qr_type)
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	108 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	109 octave_idx_type m = a.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	110 octave_idx_type n = a.cols ();
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	111
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	112 octave_idx_type min_mn = m < n ? m : n;
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	113 OCTAVE_LOCAL_BUFFER (double, tau, min_mn);
1921 ce0db0ca0729 [project @ 1996-02-11 02:31:58 by jwe] jwe parents: 1882 diff changeset	114
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	115 octave_idx_type info = 0;
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	116
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	117 Matrix afact = a;
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	118 if (m > n && qr_type == qr_type_std)
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	119 afact.resize (m, m);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	120
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	121 if (m > 0)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	122 {
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	123 // workspace query.
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	124 double rlwork;
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	125 F77_XFCN (dgeqrf, DGEQRF, (m, n, afact.fortran_vec (), m, tau, &rlwork, -1, info));
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	126
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	127 // allocate buffer and do the job.
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8806 diff changeset	128 octave_idx_type lwork = rlwork;
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8806 diff changeset	129 lwork = std::max (lwork, static_cast<octave_idx_type> (1));
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	130 OCTAVE_LOCAL_BUFFER (double, work, lwork);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	131 F77_XFCN (dgeqrf, DGEQRF, (m, n, afact.fortran_vec (), m, tau, work, lwork, info));
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	132 }
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	133
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	134 form (n, afact, tau, qr_type);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	135 }
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	136
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	137 void QR::form (octave_idx_type n, Matrix& afact,
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	138 double *tau, qr_type_t qr_type)
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	139 {
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	140 octave_idx_type m = afact.rows (), min_mn = std::min (m, n);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	141 octave_idx_type info;
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	142
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	143 if (qr_type == qr_type_raw)
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	144 {
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	145 for (octave_idx_type j = 0; j < min_mn; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	146 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	147 octave_idx_type limit = j < min_mn - 1 ? j : min_mn - 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	148 for (octave_idx_type i = limit + 1; i < m; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	149 afact.elem (i, j) *= tau[j];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	150 }
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	151
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	152 r = afact;
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	153 }
539 5ec10a984241 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: 457 diff changeset	154 else
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	155 {
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	156 // Attempt to minimize copying.
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	157 if (m >= n)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	158 {
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	159 // afact will become q.
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	160 q = afact;
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	161 octave_idx_type k = qr_type == qr_type_economy ? n : m;
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	162 r = Matrix (k, n);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	163 for (octave_idx_type j = 0; j < n; j++)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	164 {
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	165 octave_idx_type i = 0;
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	166 for (; i <= j; i++)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	167 r.xelem (i, j) = afact.xelem (i, j);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	168 for (;i < k; i++)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	169 r.xelem (i, j) = 0;
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	170 }
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	171 afact = Matrix (); // optimize memory
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	172 }
539 5ec10a984241 [project @ 1994-07-21 22:40:04 by jwe] jwe parents: 457 diff changeset	173 else
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	174 {
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	175 // afact will become r.
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	176 q = Matrix (m, m);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	177 for (octave_idx_type j = 0; j < m; j++)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	178 for (octave_idx_type i = j + 1; i < m; i++)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	179 {
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	180 q.xelem (i, j) = afact.xelem (i, j);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	181 afact.xelem (i, j) = 0;
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	182 }
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	183 r = afact;
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	184 }
1921 ce0db0ca0729 [project @ 1996-02-11 02:31:58 by jwe] jwe parents: 1882 diff changeset	185
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	186
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	187 if (m > 0)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	188 {
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	189 octave_idx_type k = q.columns ();
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	190 // workspace query.
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	191 double rlwork;
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	192 F77_XFCN (dorgqr, DORGQR, (m, k, min_mn, q.fortran_vec (), m, tau,
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	193 &rlwork, -1, info));
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	194
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	195 // allocate buffer and do the job.
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8806 diff changeset	196 octave_idx_type lwork = rlwork;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	197 lwork = std::max (lwork, static_cast<octave_idx_type> (1));
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	198 OCTAVE_LOCAL_BUFFER (double, work, lwork);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	199 F77_XFCN (dorgqr, DORGQR, (m, k, min_mn, q.fortran_vec (), m, tau,
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	200 work, lwork, info));
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	201 }
1921 ce0db0ca0729 [project @ 1996-02-11 02:31:58 by jwe] jwe parents: 1882 diff changeset	202 }
457 3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	203 }
3d4b4f0fa5ba [project @ 1994-06-06 00:33:33 by jwe] jwe parents: diff changeset	204
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	205 #ifdef HAVE_QRUPDATE
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	206
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	207 void
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	208 QR::update (const ColumnVector& u, const ColumnVector& v)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	209 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	210 octave_idx_type m = q.rows ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	211 octave_idx_type n = r.columns ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	212 octave_idx_type k = q.columns ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	213
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	214 if (u.length () == m && v.length () == n)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	215 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	216 ColumnVector utmp = u, vtmp = v;
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	217 OCTAVE_LOCAL_BUFFER (double, w, 2*k);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	218 F77_XFCN (dqr1up, DQR1UP, (m, n, k, q.fortran_vec (), m, r.fortran_vec (), k,
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	219 utmp.fortran_vec (), vtmp.fortran_vec (), w));
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	220 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	221 else
8562 a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	222 (*current_liboctave_error_handler) ("qrupdate: dimensions mismatch");
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	223 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	224
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	225 void
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	226 QR::update (const Matrix& u, const Matrix& v)
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	227 {
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	228 octave_idx_type m = q.rows ();
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	229 octave_idx_type n = r.columns ();
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	230 octave_idx_type k = q.columns ();
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	231
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	232 if (u.rows () == m && v.rows () == n && u.cols () == v.cols ())
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	233 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	234 OCTAVE_LOCAL_BUFFER (double, w, 2*k);
8806 c7864bb74914 avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	235 for (volatile octave_idx_type i = 0; i < u.cols (); i++)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	236 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	237 ColumnVector utmp = u.column (i), vtmp = v.column (i);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	238 F77_XFCN (dqr1up, DQR1UP, (m, n, k, q.fortran_vec (), m, r.fortran_vec (), k,
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	239 utmp.fortran_vec (), vtmp.fortran_vec (), w));
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	240 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	241 }
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	242 else
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	243 (*current_liboctave_error_handler) ("qrupdate: dimensions mismatch");
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	244 }
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	245
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	246 void
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	247 QR::insert_col (const ColumnVector& u, octave_idx_type j)
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	248 {
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	249 octave_idx_type m = q.rows ();
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	250 octave_idx_type n = r.columns ();
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	251 octave_idx_type k = q.columns ();
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	252
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	253 if (u.length () != m)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	254 (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch");
7560 0ef0f9802a37 modify QR updating methods to use 0-based indexing Jaroslav Hajek <highegg@gmail.com> parents: 7559 diff changeset	255 else if (j < 0 \|\| j > n)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	256 (*current_liboctave_error_handler) ("qrinsert: index out of range");
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	257 else
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	258 {
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	259 if (k < m)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	260 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	261 q.resize (m, k+1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	262 r.resize (k+1, n+1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	263 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	264 else
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	265 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	266 r.resize (k, n+1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	267 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	268
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	269 ColumnVector utmp = u;
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	270 OCTAVE_LOCAL_BUFFER (double, w, k);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	271 F77_XFCN (dqrinc, DQRINC, (m, n, k, q.fortran_vec (), q.rows (),
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	272 r.fortran_vec (), r.rows (), j + 1,
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	273 utmp.data (), w));
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	274 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	275 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	276
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	277 void
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	278 QR::insert_col (const Matrix& u, const Array<octave_idx_type>& j)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	279 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	280 octave_idx_type m = q.rows ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	281 octave_idx_type n = r.columns ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	282 octave_idx_type k = q.columns ();
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	283
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	284 Array<octave_idx_type> jsi;
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8597 diff changeset	285 Array<octave_idx_type> js = j.sort (jsi, 0, ASCENDING);
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	286 octave_idx_type nj = js.length ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	287 bool dups = false;
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	288 for (octave_idx_type i = 0; i < nj - 1; i++)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	289 dups = dups && js(i) == js(i+1);
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	290
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	291 if (dups)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	292 (*current_liboctave_error_handler) ("qrinsert: duplicate index detected");
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	293 else if (u.length () != m \|\| u.columns () != nj)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	294 (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch");
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	295 else if (nj > 0 && (js(0) < 0 \|\| js(nj-1) > n))
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	296 (*current_liboctave_error_handler) ("qrinsert: index out of range");
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	297 else if (nj > 0)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	298 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	299 octave_idx_type kmax = std::min (k + nj, m);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	300 if (k < m)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	301 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	302 q.resize (m, kmax);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	303 r.resize (kmax, n + nj);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	304 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	305 else
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	306 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	307 r.resize (k, n + nj);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	308 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	309
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	310 OCTAVE_LOCAL_BUFFER (double, w, kmax);
8806 c7864bb74914 avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	311 for (volatile octave_idx_type i = 0; i < js.length (); i++)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	312 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	313 octave_idx_type ii = i;
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	314 ColumnVector utmp = u.column (jsi(i));
9235 b03953732530 Copy volatile variable to avoid MSVC compilation error Michael Goffioul <michael.goffioul@gmail.com> parents: 8811 diff changeset	315 F77_XFCN (dqrinc, DQRINC, (m, n + ii, std::min (kmax, k + ii),
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	316 q.fortran_vec (), q.rows (),
9235 b03953732530 Copy volatile variable to avoid MSVC compilation error Michael Goffioul <michael.goffioul@gmail.com> parents: 8811 diff changeset	317 r.fortran_vec (), r.rows (), js(ii) + 1,
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	318 utmp.data (), w));
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	319 }
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	320 }
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	321 }
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	322
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	323 void
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	324 QR::delete_col (octave_idx_type j)
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	325 {
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	326 octave_idx_type m = q.rows ();
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	327 octave_idx_type k = r.rows ();
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	328 octave_idx_type n = r.columns ();
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	329
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	330 if (j < 0 \|\| j > n-1)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	331 (*current_liboctave_error_handler) ("qrdelete: index out of range");
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	332 else
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	333 {
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	334 OCTAVE_LOCAL_BUFFER (double, w, k);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	335 F77_XFCN (dqrdec, DQRDEC, (m, n, k, q.fortran_vec (), q.rows (),
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	336 r.fortran_vec (), r.rows (), j + 1, w));
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	337
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	338 if (k < m)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	339 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	340 q.resize (m, k-1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	341 r.resize (k-1, n-1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	342 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	343 else
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	344 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	345 r.resize (k, n-1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	346 }
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	347 }
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	348 }
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	349
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	350 void
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	351 QR::delete_col (const Array<octave_idx_type>& j)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	352 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	353 octave_idx_type m = q.rows ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	354 octave_idx_type n = r.columns ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	355 octave_idx_type k = q.columns ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	356
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	357 Array<octave_idx_type> jsi;
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8597 diff changeset	358 Array<octave_idx_type> js = j.sort (jsi, 0, DESCENDING);
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	359 octave_idx_type nj = js.length ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	360 bool dups = false;
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	361 for (octave_idx_type i = 0; i < nj - 1; i++)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	362 dups = dups && js(i) == js(i+1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	363
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	364 if (dups)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	365 (*current_liboctave_error_handler) ("qrinsert: duplicate index detected");
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	366 else if (nj > 0 && (js(0) > n-1 \|\| js(nj-1) < 0))
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	367 (*current_liboctave_error_handler) ("qrinsert: index out of range");
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	368 else if (nj > 0)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	369 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	370 OCTAVE_LOCAL_BUFFER (double, w, k);
8806 c7864bb74914 avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	371 for (volatile octave_idx_type i = 0; i < js.length (); i++)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	372 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	373 octave_idx_type ii = i;
9235 b03953732530 Copy volatile variable to avoid MSVC compilation error Michael Goffioul <michael.goffioul@gmail.com> parents: 8811 diff changeset	374 F77_XFCN (dqrdec, DQRDEC, (m, n - ii, k == m ? k : k - ii,
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	375 q.fortran_vec (), q.rows (),
9235 b03953732530 Copy volatile variable to avoid MSVC compilation error Michael Goffioul <michael.goffioul@gmail.com> parents: 8811 diff changeset	376 r.fortran_vec (), r.rows (), js(ii) + 1, w));
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	377 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	378 if (k < m)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	379 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	380 q.resize (m, k - nj);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	381 r.resize (k - nj, n - nj);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	382 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	383 else
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	384 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	385 r.resize (k, n - nj);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	386 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	387
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	388 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	389 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	390
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	391 void
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	392 QR::insert_row (const RowVector& u, octave_idx_type j)
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	393 {
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	394 octave_idx_type m = r.rows ();
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	395 octave_idx_type n = r.columns ();
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	396 octave_idx_type k = std::min (m, n);
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	397
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	398 if (! q.is_square () \|\| u.length () != n)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	399 (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch");
7560 0ef0f9802a37 modify QR updating methods to use 0-based indexing Jaroslav Hajek <highegg@gmail.com> parents: 7559 diff changeset	400 else if (j < 0 \|\| j > m)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	401 (*current_liboctave_error_handler) ("qrinsert: index out of range");
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	402 else
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	403 {
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	404 q.resize (m + 1, m + 1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	405 r.resize (m + 1, n);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	406 RowVector utmp = u;
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	407 OCTAVE_LOCAL_BUFFER (double, w, k);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	408 F77_XFCN (dqrinr, DQRINR, (m, n, q.fortran_vec (), q.rows (),
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	409 r.fortran_vec (), r.rows (),
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	410 j + 1, utmp.fortran_vec (), w));
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	411
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	412 }
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	413 }
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	414
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	415 void
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	416 QR::delete_row (octave_idx_type j)
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	417 {
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	418 octave_idx_type m = r.rows ();
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	419 octave_idx_type n = r.columns ();
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	420
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	421 if (! q.is_square ())
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	422 (*current_liboctave_error_handler) ("qrdelete: dimensions mismatch");
7560 0ef0f9802a37 modify QR updating methods to use 0-based indexing Jaroslav Hajek <highegg@gmail.com> parents: 7559 diff changeset	423 else if (j < 0 \|\| j > m-1)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	424 (*current_liboctave_error_handler) ("qrdelete: index out of range");
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	425 else
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	426 {
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	427 OCTAVE_LOCAL_BUFFER (double, w, 2*m);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	428 F77_XFCN (dqrder, DQRDER, (m, n, q.fortran_vec (), q.rows (),
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	429 r.fortran_vec (), r.rows (), j + 1,
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	430 w));
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	431
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	432 q.resize (m - 1, m - 1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	433 r.resize (m - 1, n);
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	434 }
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	435 }
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	436
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	437 void
7700 efccca5f2ad7 more QR & Cholesky updating functions Jaroslav Hajek <highegg@gmail.com> parents: 7560 diff changeset	438 QR::shift_cols (octave_idx_type i, octave_idx_type j)
efccca5f2ad7 more QR & Cholesky updating functions Jaroslav Hajek <highegg@gmail.com> parents: 7560 diff changeset	439 {
efccca5f2ad7 more QR & Cholesky updating functions Jaroslav Hajek <highegg@gmail.com> parents: 7560 diff changeset	440 octave_idx_type m = q.rows ();
efccca5f2ad7 more QR & Cholesky updating functions Jaroslav Hajek <highegg@gmail.com> parents: 7560 diff changeset	441 octave_idx_type k = r.rows ();
efccca5f2ad7 more QR & Cholesky updating functions Jaroslav Hajek <highegg@gmail.com> parents: 7560 diff changeset	442 octave_idx_type n = r.columns ();
efccca5f2ad7 more QR & Cholesky updating functions Jaroslav Hajek <highegg@gmail.com> parents: 7560 diff changeset	443
efccca5f2ad7 more QR & Cholesky updating functions Jaroslav Hajek <highegg@gmail.com> parents: 7560 diff changeset	444 if (i < 0 \|\| i > n-1 \|\| j < 0 \|\| j > n-1)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	445 (*current_liboctave_error_handler) ("qrshift: index out of range");
7700 efccca5f2ad7 more QR & Cholesky updating functions Jaroslav Hajek <highegg@gmail.com> parents: 7560 diff changeset	446 else
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	447 {
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	448 OCTAVE_LOCAL_BUFFER (double, w, 2*k);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	449 F77_XFCN (dqrshc, DQRSHC, (m, n, k,
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	450 q.fortran_vec (), q.rows (),
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	451 r.fortran_vec (), r.rows (),
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	452 i + 1, j + 1, w));
7553 56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	453 }
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	454 }
56be6f31dd4e implementation of QR factorization updating Jaroslav Hajek <highegg@gmail.com> parents: 7482 diff changeset	455
8562 a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	456 #else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	457
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	458 // Replacement update methods.
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	459
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	460 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	461 QR::update (const ColumnVector& u, const ColumnVector& v)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	462 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	463 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	464
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	465 octave_idx_type m = q.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	466 octave_idx_type n = r.columns ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	467
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	468 if (u.length () == m && v.length () == n)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	469 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	470 init(qr + Matrix (u) Matrix (v).transpose (), get_type ());
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	471 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	472 else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	473 (*current_liboctave_error_handler) ("qrupdate: dimensions mismatch");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	474 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	475
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	476 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	477 QR::update (const Matrix& u, const Matrix& v)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	478 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	479 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	480
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	481 octave_idx_type m = q.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	482 octave_idx_type n = r.columns ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	483
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	484 if (u.rows () == m && v.rows () == n && u.cols () == v.cols ())
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	485 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	486 init(qr + u v.transpose (), get_type ());
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	487 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	488 else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	489 (*current_liboctave_error_handler) ("qrupdate: dimensions mismatch");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	490 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	491
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	492 static
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	493 Matrix insert_col (const Matrix& a, octave_idx_type i,
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	494 const ColumnVector& x)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	495 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	496 Matrix retval (a.rows (), a.columns () + 1);
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	497 retval.assign (idx_vector::colon, idx_vector (0, i),
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	498 a.index (idx_vector::colon, idx_vector (0, i)));
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	499 retval.assign (idx_vector::colon, idx_vector (i), x);
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	500 retval.assign (idx_vector::colon, idx_vector (i+1, retval.columns ()),
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	501 a.index (idx_vector::colon, idx_vector (i, a.columns ())));
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	502 return retval;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	503 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	504
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	505 static
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	506 Matrix insert_row (const Matrix& a, octave_idx_type i,
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	507 const RowVector& x)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	508 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	509 Matrix retval (a.rows () + 1, a.columns ());
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	510 retval.assign (idx_vector (0, i), idx_vector::colon,
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	511 a.index (idx_vector (0, i), idx_vector::colon));
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	512 retval.assign (idx_vector (i), idx_vector::colon, x);
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	513 retval.assign (idx_vector (i+1, retval.rows ()), idx_vector::colon,
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	514 a.index (idx_vector (i, a.rows ()), idx_vector::colon));
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	515 return retval;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	516 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	517
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	518 static
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	519 Matrix delete_col (const Matrix& a, octave_idx_type i)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	520 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	521 Matrix retval = a;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	522 retval.delete_elements (1, idx_vector (i));
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	523 return retval;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	524 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	525
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	526 static
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	527 Matrix delete_row (const Matrix& a, octave_idx_type i)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	528 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	529 Matrix retval = a;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	530 retval.delete_elements (0, idx_vector (i));
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	531 return retval;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	532 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	533
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	534 static
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	535 Matrix shift_cols (const Matrix& a,
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	536 octave_idx_type i, octave_idx_type j)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	537 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	538 octave_idx_type n = a.columns ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	539 Array<octave_idx_type> p (n);
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	540 for (octave_idx_type k = 0; k < n; k++) p(k) = k;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	541 if (i < j)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	542 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	543 for (octave_idx_type k = i; k < j; k++) p(k) = k+1;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	544 p(j) = i;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	545 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	546 else if (j < i)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	547 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	548 p(j) = i;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	549 for (octave_idx_type k = j+1; k < i+1; k++) p(k) = k-1;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	550 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	551
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	552 return a.index (idx_vector::colon, idx_vector (p));
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	553 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	554
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	555 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	556 QR::insert_col (const ColumnVector& u, octave_idx_type j)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	557 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	558 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	559
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	560 octave_idx_type m = q.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	561 octave_idx_type n = r.columns ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	562
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	563 if (u.length () != m)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	564 (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	565 else if (j < 0 \|\| j > n)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	566 (*current_liboctave_error_handler) ("qrinsert: index out of range");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	567 else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	568 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	569 init (::insert_col (q*r, j, u), get_type ());
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	570 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	571 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	572
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	573 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	574 QR::insert_col (const Matrix& u, const Array<octave_idx_type>& j)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	575 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	576 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	577
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	578 octave_idx_type m = q.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	579 octave_idx_type n = r.columns ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	580
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	581 Array<octave_idx_type> jsi;
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8597 diff changeset	582 Array<octave_idx_type> js = j.sort (jsi, 0, ASCENDING);
8562 a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	583 octave_idx_type nj = js.length ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	584 bool dups = false;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	585 for (octave_idx_type i = 0; i < nj - 1; i++)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	586 dups = dups && js(i) == js(i+1);
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	587
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	588 if (dups)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	589 (*current_liboctave_error_handler) ("qrinsert: duplicate index detected");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	590 else if (u.length () != m \|\| u.columns () != nj)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	591 (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	592 else if (nj > 0 && (js(0) < 0 \|\| js(nj-1) > n))
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	593 (*current_liboctave_error_handler) ("qrinsert: index out of range");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	594 else if (nj > 0)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	595 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	596 Matrix a = q*r;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	597 for (octave_idx_type i = 0; i < js.length (); i++)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	598 a = ::insert_col (a, js(i), u.column (i));
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	599 init (a, get_type ());
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	600 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	601 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	602
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	603 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	604 QR::delete_col (octave_idx_type j)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	605 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	606 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	607
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	608 octave_idx_type m = q.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	609 octave_idx_type n = r.columns ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	610
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	611 if (j < 0 \|\| j > n-1)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	612 (*current_liboctave_error_handler) ("qrdelete: index out of range");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	613 else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	614 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	615 init (::delete_col (q*r, j), get_type ());
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	616 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	617 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	618
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	619 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	620 QR::delete_col (const Array<octave_idx_type>& j)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	621 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	622 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	623
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	624 octave_idx_type m = q.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	625 octave_idx_type n = r.columns ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	626
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	627 Array<octave_idx_type> jsi;
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8597 diff changeset	628 Array<octave_idx_type> js = j.sort (jsi, 0, DESCENDING);
8562 a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	629 octave_idx_type nj = js.length ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	630 bool dups = false;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	631 for (octave_idx_type i = 0; i < nj - 1; i++)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	632 dups = dups && js(i) == js(i+1);
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	633
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	634 if (dups)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	635 (*current_liboctave_error_handler) ("qrinsert: duplicate index detected");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	636 else if (nj > 0 && (js(0) > n-1 \|\| js(nj-1) < 0))
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	637 (*current_liboctave_error_handler) ("qrinsert: index out of range");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	638 else if (nj > 0)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	639 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	640 Matrix a = q*r;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	641 for (octave_idx_type i = 0; i < js.length (); i++)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	642 a = ::delete_col (a, js(i));
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	643 init (a, get_type ());
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	644 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	645 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	646
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	647 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	648 QR::insert_row (const RowVector& u, octave_idx_type j)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	649 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	650 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	651
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	652 octave_idx_type m = r.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	653 octave_idx_type n = r.columns ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	654
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	655 if (! q.is_square () \|\| u.length () != n)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	656 (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	657 else if (j < 0 \|\| j > m)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	658 (*current_liboctave_error_handler) ("qrinsert: index out of range");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	659 else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	660 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	661 init (::insert_row (q*r, j, u), get_type ());
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	662 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	663 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	664
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	665 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	666 QR::delete_row (octave_idx_type j)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	667 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	668 octave_idx_type m = r.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	669 octave_idx_type n = r.columns ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	670
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	671 if (! q.is_square ())
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	672 (*current_liboctave_error_handler) ("qrdelete: dimensions mismatch");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	673 else if (j < 0 \|\| j > m-1)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	674 (*current_liboctave_error_handler) ("qrdelete: index out of range");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	675 else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	676 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	677 init (::delete_row (q*r, j), get_type ());
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	678 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	679 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	680
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	681 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	682 QR::shift_cols (octave_idx_type i, octave_idx_type j)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	683 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	684 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	685
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	686 octave_idx_type m = q.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	687 octave_idx_type n = r.columns ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	688
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	689 if (i < 0 \|\| i > n-1 \|\| j < 0 \|\| j > n-1)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	690 (*current_liboctave_error_handler) ("qrshift: index out of range");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	691 else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	692 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	693 init (::shift_cols (q*r, i, j), get_type ());
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	694 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	695 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	696
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	697 void warn_qrupdate_once (void)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	698 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	699 static bool warned = false;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	700 if (! warned)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	701 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	702 (*current_liboctave_warning_handler)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	703 ("In this version of Octave, QR & Cholesky updating routines\n"
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	704 "simply update the matrix and recalculate factorizations.\n"
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	705 "To use fast algorithms, link Octave with the qrupdate library.\n"
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	706 "See <http://sourceforge.net/projects/qrupdate>.\n");
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	707 warned = true;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	708 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	709 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	710
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	711 #endif

Mercurial > octave-nkf

annotate liboctave/dbleQR.cc @ 11518:141b3fb5cef7