Mercurial > octave-nkf
view liboctave/numeric/floatQRP.cc @ 18883:aa9ca67f09fb
make all permutation matrices column permutations (bug #42418)
Making all permutation matrices column permutations allows permutation
matrices to be iterated over in column-major order just like any other
matrix.
* PermMatrix.h, PermMatrix.cc (PermMatrix::_colp): Delete member
variable and all uses.
(PermMatrix::transpose): Create new matrix with internal
representation flipped.
(PermMatrix::pos_power): New function.
(PermMatrix::eye): Call the one-argument constructor which already
defaults to the identity matrix.
(PermMatrix::is_col_perm): Unconditionally return true.
(PermMatrix::is_row_perm): Unconditionally return false.
(PermMatrix::data, PermMatrix::fortran_vec, PermMatrix::pvec): Delete.
(PermMatrix::col_perm_vec): New function.
* lu.cc: New test.
* base-lu.cc (base_lu<lu_type>::base_lu): Call transpose in ipvt
initialization.
* find.cc, kron.cc, pr-output.cc, ov-perm.cc, PermMatrix.cc,
PermMatrix.h, Sparse.cc, dMatrix.cc, fMatrix.cc, CmplxQRP.cc,
base-lu.cc, dbleQRP.cc, fCmplxQRP.cc, floatQRP.cc,
Sparse-perm-op-defs.h, mx-op-defs.h: Adapt to PermMatrix changes.
author | David Spies <dnspies@gmail.com> |
---|---|
date | Wed, 18 Jun 2014 19:38:40 -0600 |
parents | 49a5a4be04a1 |
children | 4197fc428c7d |
line wrap: on
line source
/* Copyright (C) 1994-2013 John W. Eaton Copyright (C) 2009 VZLU Prague This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <cassert> #include "floatQRP.h" #include "f77-fcn.h" #include "lo-error.h" #include "oct-locbuf.h" extern "C" { F77_RET_T F77_FUNC (sgeqp3, SGEQP3) (const octave_idx_type&, const octave_idx_type&, float*, const octave_idx_type&, octave_idx_type*, float*, float*, const octave_idx_type&, octave_idx_type&); } // It would be best to share some of this code with QR class... FloatQRP::FloatQRP (const FloatMatrix& a, qr_type_t qr_type) : FloatQR (), p () { init (a, qr_type); } void FloatQRP::init (const FloatMatrix& a, qr_type_t qr_type) { assert (qr_type != qr_type_raw); octave_idx_type m = a.rows (); octave_idx_type n = a.cols (); octave_idx_type min_mn = m < n ? m : n; OCTAVE_LOCAL_BUFFER (float, tau, min_mn); octave_idx_type info = 0; FloatMatrix afact = a; if (m > n && qr_type == qr_type_std) afact.resize (m, m); MArray<octave_idx_type> jpvt (dim_vector (n, 1), 0); if (m > 0) { // workspace query. float rlwork; F77_XFCN (sgeqp3, SGEQP3, (m, n, afact.fortran_vec (), m, jpvt.fortran_vec (), tau, &rlwork, -1, info)); // allocate buffer and do the job. octave_idx_type lwork = rlwork; lwork = std::max (lwork, static_cast<octave_idx_type> (1)); OCTAVE_LOCAL_BUFFER (float, work, lwork); F77_XFCN (sgeqp3, SGEQP3, (m, n, afact.fortran_vec (), m, jpvt.fortran_vec (), tau, work, lwork, info)); } else for (octave_idx_type i = 0; i < n; i++) jpvt(i) = i+1; // Form Permutation matrix (if economy is requested, return the // indices only!) jpvt -= static_cast<octave_idx_type> (1); p = PermMatrix (jpvt, true); form (n, afact, tau, qr_type); } FloatRowVector FloatQRP::Pvec (void) const { Array<float> pa (p.col_perm_vec ()); FloatRowVector pv (MArray<float> (pa) + 1.0f); return pv; }