Mercurial > octave-nkf
view liboctave/operators/mx-base.h @ 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 | d63878346099 |
children | 4197fc428c7d |
line wrap: on
line source
/* Copyright (C) 1994-2013 John W. Eaton 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/>. */ #if !defined (octave_mx_base_h) #define octave_mx_base_h 1 // Matrix Type class #include "MatrixType.h" // Matrix classes. #include "boolMatrix.h" #include "chMatrix.h" #include "dMatrix.h" #include "CMatrix.h" #include "fMatrix.h" #include "fCMatrix.h" // Column Vector classes. #include "dColVector.h" #include "CColVector.h" #include "fColVector.h" #include "fCColVector.h" // Row Vector classes. #include "dRowVector.h" #include "CRowVector.h" #include "fRowVector.h" #include "fCRowVector.h" // Diagonal Matrix classes. #include "dDiagMatrix.h" #include "CDiagMatrix.h" #include "fDiagMatrix.h" #include "fCDiagMatrix.h" // Permutation matrix class #include "PermMatrix.h" // Sparse Matrix classes. #include "boolSparse.h" #include "dSparse.h" #include "CSparse.h" // N-d Array classes. #include "boolNDArray.h" #include "chNDArray.h" #include "dNDArray.h" #include "CNDArray.h" #include "fNDArray.h" #include "fCNDArray.h" #include "int8NDArray.h" #include "int16NDArray.h" #include "int32NDArray.h" #include "int64NDArray.h" #include "uint8NDArray.h" #include "uint16NDArray.h" #include "uint32NDArray.h" #include "uint64NDArray.h" #endif