octave-nkf: liboctave/floatQR.cc annotate

annotate liboctave/floatQR.cc @ 10409:a87afd063e7d

optimize index (call strfind)

author	Jaroslav Hajek <highegg@gmail.com>
date	Thu, 11 Mar 2010 10:27:30 +0100
parents	07ebe522dac2
children	141b3fb5cef7

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

Mercurial > hg > octave-nkf

annotate liboctave/floatQR.cc @ 10409:a87afd063e7d