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

annotate liboctave/numeric/floatQR.cc @ 16660:cbb1bb7a5c3d

Added tag ss-3-7-5 for changeset 608e307b4914

author	John W. Eaton <jwe@octave.org>
date	Tue, 14 May 2013 05:23:53 -0400
parents	648dabbb4c6b
children	d63878346099

rev	line source
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	1 /*
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	2
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	3 Copyright (C) 1994-2012 John W. Eaton
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11518 diff changeset	4 Copyright (C) 2008-2009 Jaroslav Hajek
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	5 Copyright (C) 2009 VZLU Prague
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	6
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	7 This file is part of Octave.
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	8
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	9 Octave is free software; you can redistribute it and/or modify it
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	10 under the terms of the GNU General Public License as published by the
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	11 Free Software Foundation; either version 3 of the License, or (at your
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	12 option) any later version.
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	13
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	17 for more details.
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	18
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	19 You should have received a copy of the GNU General Public License
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	20 along with Octave; see the file COPYING. If not, see
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	21 <http://www.gnu.org/licenses/>.
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	22
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	23 */
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	24
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	25 #ifdef HAVE_CONFIG_H
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	26 #include <config.h>
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	27 #endif
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	28
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	29 #include "floatQR.h"
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	30 #include "f77-fcn.h"
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	31 #include "lo-error.h"
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	32 #include "Range.h"
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	33 #include "idx-vector.h"
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	34 #include "oct-locbuf.h"
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	35
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	36 #include "base-qr.cc"
7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	37
7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	38 template class base_qr<FloatMatrix>;
7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	39
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	40 extern "C"
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	41 {
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	42 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	43 F77_FUNC (sgeqrf, SGEQRF) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	44 float, const octave_idx_type&, float, float*,
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	45 const octave_idx_type&, octave_idx_type&);
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	46
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	47 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	48 F77_FUNC (sorgqr, SORGQR) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	49 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	50 const octave_idx_type&, float, float,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	51 const octave_idx_type&, octave_idx_type&);
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	52
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	53 #ifdef HAVE_QRUPDATE
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	54
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	55 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	56 F77_FUNC (sqr1up, SQR1UP) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	57 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	58 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	59 const octave_idx_type&, float, float, float*);
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	60
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	61 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	62 F77_FUNC (sqrinc, SQRINC) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	63 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	64 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	65 const octave_idx_type&,
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	66 const octave_idx_type&, const float, float);
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	67
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	68 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	69 F77_FUNC (sqrdec, SQRDEC) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	70 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	71 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	72 const octave_idx_type&,
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	73 const octave_idx_type&, float*);
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	74
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	75 F77_RET_T
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	76 F77_FUNC (sqrinr, SQRINR) (const octave_idx_type&, const octave_idx_type&,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	77 float*, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	78 float*, const octave_idx_type&,
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	79 const octave_idx_type&, const float, float);
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	80
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	81 F77_RET_T
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	82 F77_FUNC (sqrder, SQRDER) (const octave_idx_type&, const octave_idx_type&,
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	83 float*, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	84 float*, const octave_idx_type&,
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	85 const octave_idx_type&, float*);
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	86
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	87 F77_RET_T
11518 141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	88 F77_FUNC (sqrshc, SQRSHC) (const octave_idx_type&, const octave_idx_type&,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	89 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	90 const octave_idx_type&, float*,
141b3fb5cef7 style fixes John W. Eaton <jwe@octave.org> parents: 10314 diff changeset	91 const octave_idx_type&,
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	92 const octave_idx_type&, const octave_idx_type&,
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	93 float*);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	94
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	95 #endif
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	96 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	97
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	98 FloatQR::FloatQR (const FloatMatrix& a, qr_type_t qr_type)
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	99 {
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	100 init (a, qr_type);
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	101 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	102
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	103 void
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	104 FloatQR::init (const FloatMatrix& a, qr_type_t qr_type)
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	105 {
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	106 octave_idx_type m = a.rows ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	107 octave_idx_type n = a.cols ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	108
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	109 octave_idx_type min_mn = m < n ? m : n;
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	110 OCTAVE_LOCAL_BUFFER (float, tau, min_mn);
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	111
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	112 octave_idx_type info = 0;
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	113
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	114 FloatMatrix afact = a;
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	115 if (m > n && qr_type == qr_type_std)
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	116 afact.resize (m, m);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	117
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	118 if (m > 0)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	119 {
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	120 // workspace query.
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	121 float rlwork;
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	122 F77_XFCN (sgeqrf, SGEQRF, (m, n, afact.fortran_vec (), m, tau, &rlwork, -1, info));
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	123
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	124 // allocate buffer and do the job.
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8806 diff changeset	125 octave_idx_type lwork = rlwork;
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8806 diff changeset	126 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	127 OCTAVE_LOCAL_BUFFER (float, work, lwork);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	128 F77_XFCN (sgeqrf, SGEQRF, (m, n, afact.fortran_vec (), m, tau, work, lwork, info));
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	129 }
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	130
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	131 form (n, afact, tau, qr_type);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	132 }
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	133
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	134 void FloatQR::form (octave_idx_type n, FloatMatrix& afact,
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	135 float *tau, qr_type_t qr_type)
8597 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 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	138 octave_idx_type info;
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	139
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	140 if (qr_type == qr_type_raw)
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	141 {
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	142 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	143 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	144 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	145 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	146 afact.elem (i, j) *= tau[j];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	147 }
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	148
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	149 r = afact;
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	150 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	151 else
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	152 {
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	153 // Attempt to minimize copying.
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	154 if (m >= n)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	155 {
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	156 // afact will become q.
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	157 q = afact;
9713 7918eb15040c refactor the QR classes onto a templated base Jaroslav Hajek <highegg@gmail.com> parents: 9235 diff changeset	158 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	159 r = FloatMatrix (k, n);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	160 for (octave_idx_type j = 0; j < n; j++)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	161 {
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	162 octave_idx_type i = 0;
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	163 for (; i <= j; i++)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	164 r.xelem (i, j) = afact.xelem (i, j);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	165 for (;i < k; i++)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	166 r.xelem (i, j) = 0;
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	167 }
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	168 afact = FloatMatrix (); // optimize memory
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	169 }
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	170 else
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	171 {
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	172 // afact will become r.
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	173 q = FloatMatrix (m, m);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	174 for (octave_idx_type j = 0; j < m; j++)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	175 for (octave_idx_type i = j + 1; i < m; i++)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	176 {
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	177 q.xelem (i, j) = afact.xelem (i, j);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	178 afact.xelem (i, j) = 0;
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 r = afact;
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	181 }
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	182
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	183
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	184 if (m > 0)
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	185 {
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	186 octave_idx_type k = q.columns ();
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	187 // workspace query.
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	188 float rlwork;
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	189 F77_XFCN (sorgqr, SORGQR, (m, k, min_mn, q.fortran_vec (), m, tau,
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	190 &rlwork, -1, info));
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	191
8597 c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	192 // allocate buffer and do the job.
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8806 diff changeset	193 octave_idx_type lwork = rlwork;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	194 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	195 OCTAVE_LOCAL_BUFFER (float, work, lwork);
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	196 F77_XFCN (sorgqr, SORGQR, (m, k, min_mn, q.fortran_vec (), m, tau,
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	197 work, lwork, info));
c86718093c1b improve & fix QR classes Jaroslav Hajek <highegg@gmail.com> parents: 8562 diff changeset	198 }
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	199 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	200 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	201
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	202 #ifdef HAVE_QRUPDATE
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	203
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	204 void
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	205 FloatQR::update (const FloatColumnVector& u, const FloatColumnVector& v)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	206 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	207 octave_idx_type m = q.rows ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	208 octave_idx_type n = r.columns ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	209 octave_idx_type k = q.columns ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	210
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	211 if (u.length () == m && v.length () == n)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	212 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	213 FloatColumnVector utmp = u, vtmp = v;
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	214 OCTAVE_LOCAL_BUFFER (float, w, 2*k);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	215 F77_XFCN (sqr1up, SQR1UP, (m, n, k, q.fortran_vec (), m, r.fortran_vec (), k,
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	216 utmp.fortran_vec (), vtmp.fortran_vec (), w));
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	217 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	218 else
8562 a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	219 (*current_liboctave_error_handler) ("qrupdate: dimensions mismatch");
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	220 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	221
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	222 void
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	223 FloatQR::update (const FloatMatrix& u, const FloatMatrix& v)
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	224 {
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	225 octave_idx_type m = q.rows ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	226 octave_idx_type n = r.columns ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	227 octave_idx_type k = q.columns ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	228
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	229 if (u.rows () == m && v.rows () == n && u.cols () == v.cols ())
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	230 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	231 OCTAVE_LOCAL_BUFFER (float, w, 2*k);
8806 c7864bb74914 avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	232 for (volatile octave_idx_type i = 0; i < u.cols (); i++)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	233 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	234 FloatColumnVector utmp = u.column (i), vtmp = v.column (i);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	235 F77_XFCN (sqr1up, SQR1UP, (m, n, k, q.fortran_vec (), m, r.fortran_vec (), k,
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	236 utmp.fortran_vec (), vtmp.fortran_vec (), w));
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	237 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	238 }
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	239 else
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	240 (*current_liboctave_error_handler) ("qrupdate: dimensions mismatch");
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	241 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	242
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	243 void
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	244 FloatQR::insert_col (const FloatColumnVector& u, octave_idx_type j)
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	245 {
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	246 octave_idx_type m = q.rows ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	247 octave_idx_type n = r.columns ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	248 octave_idx_type k = q.columns ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	249
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	250 if (u.length () != m)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	251 (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	252 else if (j < 0 \|\| j > n)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	253 (*current_liboctave_error_handler) ("qrinsert: index out of range");
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	254 else
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	255 {
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	256 if (k < m)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	257 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	258 q.resize (m, k+1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	259 r.resize (k+1, n+1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	260 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	261 else
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	262 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	263 r.resize (k, n+1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	264 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	265
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	266 FloatColumnVector utmp = u;
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	267 OCTAVE_LOCAL_BUFFER (float, w, k);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	268 F77_XFCN (sqrinc, SQRINC, (m, n, k, q.fortran_vec (), q.rows (),
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	269 r.fortran_vec (), r.rows (), j + 1,
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	270 utmp.data (), w));
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	271 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	272 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	273
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	274 void
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	275 FloatQR::insert_col (const FloatMatrix& u, const Array<octave_idx_type>& j)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	276 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	277 octave_idx_type m = q.rows ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	278 octave_idx_type n = r.columns ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	279 octave_idx_type k = q.columns ();
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	280
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	281 Array<octave_idx_type> jsi;
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8597 diff changeset	282 Array<octave_idx_type> js = j.sort (jsi, 0, ASCENDING);
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	283 octave_idx_type nj = js.length ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	284 bool dups = false;
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	285 for (octave_idx_type i = 0; i < nj - 1; i++)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	286 dups = dups && js(i) == js(i+1);
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	287
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	288 if (dups)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	289 (*current_liboctave_error_handler) ("qrinsert: duplicate index detected");
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	290 else if (u.length () != m \|\| u.columns () != nj)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	291 (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch");
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	292 else if (nj > 0 && (js(0) < 0 \|\| js(nj-1) > n))
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	293 (*current_liboctave_error_handler) ("qrinsert: index out of range");
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	294 else if (nj > 0)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	295 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	296 octave_idx_type kmax = std::min (k + nj, m);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	297 if (k < m)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	298 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	299 q.resize (m, kmax);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	300 r.resize (kmax, n + nj);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	301 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	302 else
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	303 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	304 r.resize (k, n + nj);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	305 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	306
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	307 OCTAVE_LOCAL_BUFFER (float, w, kmax);
8806 c7864bb74914 avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	308 for (volatile octave_idx_type i = 0; i < js.length (); i++)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	309 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	310 octave_idx_type ii = i;
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	311 FloatColumnVector utmp = u.column (jsi(i));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	312 F77_XFCN (sqrinc, SQRINC, (m, n + ii, std::min (kmax, k + ii),
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	313 q.fortran_vec (), q.rows (),
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	314 r.fortran_vec (), r.rows (), js(ii) + 1,
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	315 utmp.data (), w));
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	316 }
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	317 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	318 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	319
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	320 void
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	321 FloatQR::delete_col (octave_idx_type j)
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	322 {
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	323 octave_idx_type m = q.rows ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	324 octave_idx_type k = r.rows ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	325 octave_idx_type n = r.columns ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	326
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	327 if (j < 0 \|\| j > n-1)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	328 (*current_liboctave_error_handler) ("qrdelete: index out of range");
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	329 else
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	330 {
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	331 OCTAVE_LOCAL_BUFFER (float, w, k);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	332 F77_XFCN (sqrdec, SQRDEC, (m, n, k, q.fortran_vec (), q.rows (),
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	333 r.fortran_vec (), r.rows (), j + 1, w));
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	334
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	335 if (k < m)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	336 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	337 q.resize (m, k-1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	338 r.resize (k-1, n-1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	339 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	340 else
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	341 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	342 r.resize (k, n-1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	343 }
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	344 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	345 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	346
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	347 void
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	348 FloatQR::delete_col (const Array<octave_idx_type>& j)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	349 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	350 octave_idx_type m = q.rows ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	351 octave_idx_type n = r.columns ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	352 octave_idx_type k = q.columns ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	353
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	354 Array<octave_idx_type> jsi;
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8597 diff changeset	355 Array<octave_idx_type> js = j.sort (jsi, 0, DESCENDING);
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	356 octave_idx_type nj = js.length ();
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	357 bool dups = false;
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	358 for (octave_idx_type i = 0; i < nj - 1; i++)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	359 dups = dups && js(i) == js(i+1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	360
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	361 if (dups)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	362 (*current_liboctave_error_handler) ("qrinsert: duplicate index detected");
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	363 else if (nj > 0 && (js(0) > n-1 \|\| js(nj-1) < 0))
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	364 (*current_liboctave_error_handler) ("qrinsert: index out of range");
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	365 else if (nj > 0)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	366 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	367 OCTAVE_LOCAL_BUFFER (float, w, k);
8806 c7864bb74914 avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 8721 diff changeset	368 for (volatile octave_idx_type i = 0; i < js.length (); i++)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	369 {
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	370 octave_idx_type ii = i;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	371 F77_XFCN (sqrdec, SQRDEC, (m, n - ii, k == m ? k : k - ii,
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	372 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	373 r.fortran_vec (), r.rows (), js(ii) + 1, w));
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	374 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	375 if (k < m)
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	376 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	377 q.resize (m, k - nj);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	378 r.resize (k - nj, n - nj);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	379 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	380 else
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	381 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	382 r.resize (k, n - nj);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	383 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	384
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	385 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	386 }
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	387
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	388 void
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	389 FloatQR::insert_row (const FloatRowVector& u, octave_idx_type j)
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	390 {
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	391 octave_idx_type m = r.rows ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	392 octave_idx_type n = r.columns ();
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	393 octave_idx_type k = std::min (m, n);
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	394
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	395 if (! q.is_square () \|\| u.length () != n)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	396 (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	397 else if (j < 0 \|\| j > m)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	398 (*current_liboctave_error_handler) ("qrinsert: index out of range");
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	399 else
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	400 {
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	401 q.resize (m + 1, m + 1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	402 r.resize (m + 1, n);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	403 FloatRowVector utmp = u;
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	404 OCTAVE_LOCAL_BUFFER (float, w, k);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	405 F77_XFCN (sqrinr, SQRINR, (m, n, q.fortran_vec (), q.rows (),
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	406 r.fortran_vec (), r.rows (),
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	407 j + 1, utmp.fortran_vec (), w));
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	408
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	409 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	410 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	411
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	412 void
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	413 FloatQR::delete_row (octave_idx_type j)
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	414 {
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	415 octave_idx_type m = r.rows ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	416 octave_idx_type n = r.columns ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	417
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	418 if (! q.is_square ())
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	419 (*current_liboctave_error_handler) ("qrdelete: dimensions mismatch");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	420 else if (j < 0 \|\| j > m-1)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	421 (*current_liboctave_error_handler) ("qrdelete: index out of range");
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	422 else
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	423 {
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	424 OCTAVE_LOCAL_BUFFER (float, w, 2*m);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	425 F77_XFCN (sqrder, SQRDER, (m, n, q.fortran_vec (), q.rows (),
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	426 r.fortran_vec (), r.rows (), j + 1,
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	427 w));
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	428
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	429 q.resize (m - 1, m - 1);
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	430 r.resize (m - 1, n);
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	431 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	432 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	433
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	434 void
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	435 FloatQR::shift_cols (octave_idx_type i, octave_idx_type j)
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	436 {
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	437 octave_idx_type m = q.rows ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	438 octave_idx_type k = r.rows ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	439 octave_idx_type n = r.columns ();
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	440
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	441 if (i < 0 \|\| i > n-1 \|\| j < 0 \|\| j > n-1)
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	442 (*current_liboctave_error_handler) ("qrshift: index out of range");
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	443 else
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	444 {
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	445 OCTAVE_LOCAL_BUFFER (float, w, 2*k);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	446 F77_XFCN (sqrshc, SQRSHC, (m, n, k,
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	447 q.fortran_vec (), q.rows (),
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	448 r.fortran_vec (), r.rows (),
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	449 i + 1, j + 1, w));
d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	450 }
7792 39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	451 }
39c1026191e9 add missing files from single-precision merge John W. Eaton <jwe@octave.org> parents: diff changeset	452
8562 a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	453 #else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	454
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	455 // Replacement update methods.
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	456
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	457 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	458 FloatQR::update (const FloatColumnVector& u, const FloatColumnVector& v)
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 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	461
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	462 octave_idx_type m = q.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	463 octave_idx_type n = r.columns ();
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 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	466 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14138 diff changeset	467 init (qr + FloatMatrix (u) FloatMatrix (v).transpose (), get_type ());
8562 a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	468 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	469 else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	470 (*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	471 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	472
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	473 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	474 FloatQR::update (const FloatMatrix& u, const FloatMatrix& v)
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 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	477
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	478 octave_idx_type m = q.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	479 octave_idx_type n = r.columns ();
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 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	482 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14138 diff changeset	483 init (qr + u v.transpose (), get_type ());
8562 a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	484 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	485 else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	486 (*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	487 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	488
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	489 static
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	490 FloatMatrix insert_col (const FloatMatrix& a, octave_idx_type i,
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	491 const FloatColumnVector& x)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	492 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	493 FloatMatrix retval (a.rows (), a.columns () + 1);
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	494 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	495 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	496 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	497 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	498 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	499 return retval;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	500 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	501
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	502 static
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	503 FloatMatrix insert_row (const FloatMatrix& a, octave_idx_type i,
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	504 const FloatRowVector& x)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	505 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	506 FloatMatrix retval (a.rows () + 1, a.columns ());
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	507 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	508 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	509 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	510 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	511 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	512 return retval;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	513 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	514
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	515 static
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	516 FloatMatrix delete_col (const FloatMatrix& a, octave_idx_type i)
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 FloatMatrix retval = a;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	519 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	520 return retval;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	521 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	522
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	523 static
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	524 FloatMatrix delete_row (const FloatMatrix& a, octave_idx_type i)
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 FloatMatrix retval = a;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	527 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	528 return retval;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	529 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	530
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	531 static
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	532 FloatMatrix shift_cols (const FloatMatrix& a,
8562 a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	533 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	534 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	535 octave_idx_type n = a.columns ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	536 Array<octave_idx_type> p (n);
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	537 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	538 if (i < j)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	539 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	540 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	541 p(j) = i;
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 else if (j < i)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	544 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	545 p(j) = i;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	546 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	547 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	548
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	549 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	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 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	553 FloatQR::insert_col (const FloatColumnVector& u, octave_idx_type j)
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 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	556
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	557 octave_idx_type m = q.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	558 octave_idx_type n = r.columns ();
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 if (u.length () != m)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	561 (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	562 else if (j < 0 \|\| j > n)
8562 a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	563 (*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	564 else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	565 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	566 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	567 }
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
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	570 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	571 FloatQR::insert_col (const FloatMatrix& 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	572 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	573 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	574
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	575 octave_idx_type m = q.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	576 octave_idx_type n = r.columns ();
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 Array<octave_idx_type> jsi;
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8597 diff changeset	579 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	580 octave_idx_type nj = js.length ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	581 bool dups = false;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	582 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	583 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	584
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	585 if (dups)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	586 (*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	587 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	588 (*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	589 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	590 (*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	591 else if (nj > 0)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	592 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	593 FloatMatrix a = q*r;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	594 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	595 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	596 init (a, get_type ());
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	597 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	598 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	599
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	600 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	601 FloatQR::delete_col (octave_idx_type j)
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 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	604
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	605 octave_idx_type m = q.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	606 octave_idx_type n = r.columns ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	607
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	608 if (j < 0 \|\| j > n-1)
8562 a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	609 (*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	610 else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	611 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	612 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	613 }
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
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	616 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	617 FloatQR::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	618 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	619 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	620
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	621 octave_idx_type m = q.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	622 octave_idx_type n = r.columns ();
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 Array<octave_idx_type> jsi;
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8597 diff changeset	625 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	626 octave_idx_type nj = js.length ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	627 bool dups = false;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	628 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	629 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	630
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	631 if (dups)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	632 (*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	633 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	634 (*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	635 else if (nj > 0)
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	636 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	637 FloatMatrix a = q*r;
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	638 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	639 a = ::delete_col (a, js(i));
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	640 init (a, get_type ());
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	641 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	642 }
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	643
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	644 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	645 FloatQR::insert_row (const FloatRowVector& u, octave_idx_type j)
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 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	648
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	649 octave_idx_type m = r.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	650 octave_idx_type n = r.columns ();
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 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	653 (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	654 else if (j < 0 \|\| j > m)
8562 a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	655 (*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	656 else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	657 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	658 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	659 }
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
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	662 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	663 FloatQR::delete_row (octave_idx_type j)
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 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	666
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	667 octave_idx_type m = r.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	668 octave_idx_type n = r.columns ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	669
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	670 if (! q.is_square ())
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	671 (*current_liboctave_error_handler) ("qrdelete: dimensions mismatch");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	672 else if (j < 0 \|\| j > m-1)
8562 a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	673 (*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	674 else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	675 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	676 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	677 }
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 void
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	681 FloatQR::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	682 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	683 warn_qrupdate_once ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	684
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	685 octave_idx_type m = q.rows ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	686 octave_idx_type n = r.columns ();
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	687
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	688 if (i < 0 \|\| i > n-1 \|\| j < 0 \|\| j > n-1)
8562 a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	689 (*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	690 else
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	691 {
a6edd5c23cb5 use replacement methods if qrupdate is not available Jaroslav Hajek <highegg@gmail.com> parents: 8547 diff changeset	692 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	693 }
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
8547 d66c9b6e506a imported patch qrupdate.diff Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	696 #endif

Mercurial > hg > octave-nkf

annotate liboctave/numeric/floatQR.cc @ 16660:cbb1bb7a5c3d