Mercurial > octave-nkf
view liboctave/numeric/base-dae.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) 2002-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_base_dae_h) #define octave_base_dae_h 1 #include "base-de.h" class base_diff_alg_eqn : public base_diff_eqn { public: base_diff_alg_eqn (void) : base_diff_eqn (), xdot () { } base_diff_alg_eqn (const ColumnVector& xx, double tt) : base_diff_eqn (xx, tt), xdot (xx.length (), 0.0) { } base_diff_alg_eqn (const ColumnVector& xx, const ColumnVector& xxdot, double tt) : base_diff_eqn (xx, tt), xdot (xxdot) { } base_diff_alg_eqn (const base_diff_alg_eqn& a) : base_diff_eqn (a), xdot (a.xdot) { } virtual ~base_diff_alg_eqn (void) { } base_diff_alg_eqn& operator = (const base_diff_alg_eqn& a) { if (this != &a) { base_diff_eqn::operator = (a); xdot = a.xdot; } return *this; } void initialize (const ColumnVector& x0, double t0) { base_diff_eqn::initialize (x0, t0); xdot = ColumnVector (x0.length (), 0.0); } void initialize (const ColumnVector& x0, const ColumnVector& xdot0, double t0) { base_diff_eqn::initialize (x0, t0); xdot = xdot0; } ColumnVector state_derivative (void) { return xdot; } protected: ColumnVector xdot; }; #endif