jwe/octave: liboctave/numeric/floatQR.cc annotate

annotate liboctave/numeric/floatQR.cc @ 21136:7cac4e7458f2

maint: clean up code around calls to current_liboctave_error_handler. Remove statements after call to handler that are no longer reachable. Place input validation first and immediately call handler if necessary. Change if/error_handler/else to if/error_handler and re-indent code. * Array-util.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MArray.cc, PermMatrix.cc, Sparse.cc, Sparse.h, chMatrix.cc, chNDArray.cc, dColVector.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc, idx-vector.cc, CmplxAEPBAL.cc, CmplxCHOL.cc, CmplxGEPBAL.cc, CmplxHESS.cc, CmplxLU.cc, CmplxQR.cc, CmplxSCHUR.cc, CmplxSVD.cc, DASPK.cc, EIG.cc, LSODE.cc, Quad.cc, SparseCmplxCHOL.cc, SparseCmplxLU.cc, SparseCmplxQR.cc, SparseQR.cc, SparsedbleCHOL.cc, SparsedbleLU.cc, base-lu.cc, bsxfun-defs.cc, dbleAEPBAL.cc, dbleCHOL.cc, dbleGEPBAL.cc, dbleHESS.cc, dbleLU.cc, dbleQR.cc, dbleSCHUR.cc, dbleSVD.cc, eigs-base.cc, fCmplxAEPBAL.cc, fCmplxCHOL.cc, fCmplxLU.cc, fCmplxQR.cc, fCmplxSCHUR.cc, fEIG.cc, floatAEPBAL.cc, floatCHOL.cc, floatGEPBAL.cc, floatHESS.cc, floatLU.cc, floatQR.cc, floatSCHUR.cc, floatSVD.cc, lo-specfun.cc, oct-fftw.cc, oct-rand.cc, oct-spparms.cc, sparse-base-chol.cc, sparse-dmsolve.cc, file-ops.cc, lo-sysdep.cc, mach-info.cc, oct-env.cc, oct-syscalls.cc, cmd-edit.cc, cmd-hist.cc, data-conv.cc, lo-ieee.cc, lo-regexp.cc, oct-base64.cc, oct-shlib.cc, pathsearch.cc, singleton-cleanup.cc, sparse-util.cc, unwind-prot.cc: Remove statements after call to handler that are no longer reachable. Place input validation first and immediately call handler if necessary. Change if/error_handler/else to if/error_handler and re-indent code.

author	Rik <rik@octave.org>
date	Sat, 23 Jan 2016 13:52:03 -0800
parents	a9574e3c6e9e
children	f7121e111991

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

Mercurial > jwe > octave

annotate liboctave/numeric/floatQR.cc @ 21136:7cac4e7458f2