Mercurial > octave-nkf
view liboctave/numeric/DET.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) 2008-2013 Jaroslav Hajek 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_DET_h) #define octave_DET_h 1 #include <cmath> #include "oct-cmplx.h" #include "lo-mappers.h" template <class T> class base_det { public: base_det (T c = 1, int e = 0) : c2 (), e2 () { c2 = xlog2 (c, e2); e2 += e; } base_det (T c, double e, double b) : c2 (), e2 () { e *= xlog2 (b); e2 = e; c *= xexp2 (e - e2); int f; c2 = xlog2 (c, f); e2 += f; } base_det (const base_det& a) : c2 (a.c2), e2 (a.e2) { } base_det& operator = (const base_det& a) { c2 = a.c2; e2 = a.e2; return *this; } T coef (void) const { return c2; } int exp (void) const { return e2; } T value () const { return c2 * static_cast<T> (std::ldexp (1.0, e2)); } operator T () const { return value (); } base_det square () const { return base_det (c2*c2, e2+e2); } void operator *= (T t) { int e; c2 *= xlog2 (t, e); e2 += e; } private: T c2; int e2; }; // Provide the old types by typedefs. typedef base_det<double> DET; typedef base_det<float> FloatDET; typedef base_det<Complex> ComplexDET; typedef base_det<FloatComplex> FloatComplexDET; #endif