Mercurial > octave-nkf
view liboctave/numeric/SparsedbleCHOL.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) 2005-2013 David Bateman Copyright (C) 1998-2005 Andy Adler 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_SparsedbleCHOL_h) #define octave_SparsedbleCHOL_h 1 #include "sparse-base-chol.h" #include "dSparse.h" class OCTAVE_API SparseCHOL : public sparse_base_chol <SparseMatrix, double, SparseMatrix> { public: SparseCHOL (void) : sparse_base_chol<SparseMatrix, double, SparseMatrix> () { } SparseCHOL (const SparseMatrix& a, bool natural = true, bool force = false) : sparse_base_chol<SparseMatrix, double, SparseMatrix> (a, natural, force) { } SparseCHOL (const SparseMatrix& a, octave_idx_type& info, bool natural = false, bool force = false) : sparse_base_chol<SparseMatrix, double, SparseMatrix> (a, info, natural, force) { } SparseCHOL (const SparseCHOL& a) : sparse_base_chol<SparseMatrix, double, SparseMatrix> (a) { } ~SparseCHOL (void) { } SparseCHOL& operator = (const SparseCHOL& a) { if (this != &a) sparse_base_chol <SparseMatrix, double, SparseMatrix> :: operator = (a); return *this; } SparseMatrix chol_matrix (void) const { return R (); } SparseMatrix L (void) const { return sparse_base_chol<SparseMatrix, double, SparseMatrix>:: L (); } SparseMatrix R (void) const { return sparse_base_chol<SparseMatrix, double, SparseMatrix>:: R (); } octave_idx_type P (void) const { return sparse_base_chol<SparseMatrix, double, SparseMatrix>:: P (); } ColumnVector perm (void) const { return sparse_base_chol<SparseMatrix, double, SparseMatrix>:: perm (); } SparseMatrix Q (void) const { return sparse_base_chol<SparseMatrix, double, SparseMatrix>:: Q (); } double rcond (void) const { return sparse_base_chol<SparseMatrix, double, SparseMatrix>:: rcond (); } // Compute the inverse of a matrix using the Cholesky factorization. SparseMatrix inverse (void) const { return sparse_base_chol<SparseMatrix, double, SparseMatrix>:: inverse (); } }; SparseMatrix OCTAVE_API chol2inv (const SparseMatrix& r); #endif