Mercurial > octave-nkf
view liboctave/numeric/oct-spparms.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) 2004-2013 David Bateman Copyright (C) 1998-2004 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_oct_spparms_h) #define octave_oct_spparms_h 1 #include <cassert> #include <cstddef> #include <iosfwd> #include "str-vec.h" #include "dColVector.h" #include "dNDArray.h" #define OCTAVE_SPARSE_CONTROLS_SIZE 13 class OCTAVE_API octave_sparse_params { protected: octave_sparse_params (void) : params (OCTAVE_SPARSE_CONTROLS_SIZE), keys (OCTAVE_SPARSE_CONTROLS_SIZE) { init_keys (); do_defaults (); } public: octave_sparse_params (const octave_sparse_params& a) : params (a.params), keys (a.keys) { } octave_sparse_params& operator = (const octave_sparse_params& a) { if (&a != this) { params = a.params; keys = a.keys; } return *this; } ~octave_sparse_params (void) { } static bool instance_ok (void); static void defaults (void); static void tight (void); static string_vector get_keys (void); static ColumnVector get_vals (void); static bool set_vals (const NDArray& vals); static bool set_key (const std::string& key, const double& val); static double get_key (const std::string& key); static double get_bandden (void); static void print_info (std::ostream& os, const std::string& prefix); private: ColumnVector params; string_vector keys; static octave_sparse_params *instance; static void cleanup_instance (void) { delete instance; instance = 0; } void do_defaults (void); void do_tight (void); string_vector do_get_keys (void) const { return keys; } ColumnVector do_get_vals (void) const { return params; } bool do_set_vals (const NDArray& vals); bool do_set_key (const std::string& key, const double& val); double do_get_key (const std::string& key); double do_get_bandden (void); void do_print_info (std::ostream& os, const std::string& prefix) const; void init_keys (void); }; #endif