Mercurial > octave-nkf
view liboctave/numeric/oct-norm.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 | ebb3ef964372 |
children | 4197fc428c7d |
line wrap: on
line source
/* Copyright (C) 2008-2013 VZLU Prague, a.s. 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/>. */ // author: Jaroslav Hajek <highegg@gmail.com> #if !defined (octave_oct_norm_h) #define octave_oct_norm_h 1 #include "oct-cmplx.h" #define DECLARE_XNORM_FUNCS(PREFIX, RTYPE) \ class PREFIX##Matrix; \ class PREFIX##ColumnVector; \ class PREFIX##RowVector; \ \ extern OCTAVE_API RTYPE xnorm (const PREFIX##ColumnVector&, RTYPE p = 2); \ extern OCTAVE_API RTYPE xnorm (const PREFIX##RowVector&, RTYPE p = 2); \ extern OCTAVE_API RTYPE xnorm (const PREFIX##Matrix&, RTYPE p = 2); \ extern OCTAVE_API RTYPE xfrobnorm (const PREFIX##Matrix&); DECLARE_XNORM_FUNCS(, double) DECLARE_XNORM_FUNCS(Complex, double) DECLARE_XNORM_FUNCS(Float, float) DECLARE_XNORM_FUNCS(FloatComplex, float) DECLARE_XNORM_FUNCS(Sparse, double) DECLARE_XNORM_FUNCS(SparseComplex, double) #define DECLARE_COLROW_NORM_FUNCS(PREFIX, RPREFIX, RTYPE) \ extern OCTAVE_API RPREFIX##RowVector xcolnorms (const PREFIX##Matrix&, RTYPE p = 2); \ extern OCTAVE_API RPREFIX##ColumnVector xrownorms (const PREFIX##Matrix&, RTYPE p = 2); \ DECLARE_COLROW_NORM_FUNCS(, , double) DECLARE_COLROW_NORM_FUNCS(Complex, , double) DECLARE_COLROW_NORM_FUNCS(Float, Float, float) DECLARE_COLROW_NORM_FUNCS(FloatComplex, Float, float) DECLARE_COLROW_NORM_FUNCS(Sparse, , double) DECLARE_COLROW_NORM_FUNCS(SparseComplex, , double) #endif