Mercurial > octave-nkf
view liboctave/numeric/ODEFunc.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 | 49a5a4be04a1 |
children | 4197fc428c7d |
line wrap: on
line source
/* Copyright (C) 1993-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_ODEFunc_h) #define octave_ODEFunc_h 1 class Matrix; class ColumnVector; class ODEFunc { public: typedef ColumnVector (*ODERHSFunc) (const ColumnVector&, double); typedef Matrix (*ODEJacFunc) (const ColumnVector&, double); ODEFunc (void) : fun (0), jac (0), reset (true) { } ODEFunc (ODERHSFunc f) : fun (f), jac (0), reset (true) { } ODEFunc (ODERHSFunc f, ODEJacFunc j) : fun (f), jac (j), reset (true) { } ODEFunc (const ODEFunc& a) : fun (a.fun), jac (a.jac), reset (true) { } ODEFunc& operator = (const ODEFunc& a) { if (this != &a) { fun = a.fun; jac = a.jac; reset = a.reset; } return *this; } virtual ~ODEFunc (void) { } ODERHSFunc function (void) const { return fun; } ODEFunc& set_function (ODERHSFunc f) { fun = f; reset = true; return *this; } ODEJacFunc jacobian_function (void) const { return jac; } ODEFunc& set_jacobian_function (ODEJacFunc j) { jac = j; reset = true; return *this; } protected: ODERHSFunc fun; ODEJacFunc jac; // This variable is TRUE when this object is constructed, and also // after any internal data has changed. Derived classes may use // this information (and change it) to know when to (re)initialize // their own internal data related to this object. bool reset; }; #endif