Mercurial > octave-nkf
view liboctave/numeric/Quad.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) 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_Quad_h) #define octave_Quad_h 1 #include <cfloat> #include "dColVector.h" #include "fColVector.h" #include "lo-math.h" typedef double (*integrand_fcn) (double x); typedef float (*float_integrand_fcn) (float x); // FIXME: would be nice to not have to have this global variable. // Nonzero means an error occurred in the calculation of the integrand // function, and the user wants us to quit. extern OCTAVE_API int quad_integration_error; #include "Quad-opts.h" class OCTAVE_API Quad : public Quad_options { public: Quad (integrand_fcn fcn) : Quad_options (), f (fcn), ff () { } Quad (float_integrand_fcn fcn) : Quad_options (), f (), ff (fcn) { } virtual ~Quad (void) { } virtual double integrate (void) { octave_idx_type ier, neval; double abserr; return do_integrate (ier, neval, abserr); } virtual float float_integrate (void) { octave_idx_type ier, neval; float abserr; return do_integrate (ier, neval, abserr); } virtual double integrate (octave_idx_type& ier) { octave_idx_type neval; double abserr; return do_integrate (ier, neval, abserr); } virtual float float_integrate (octave_idx_type& ier) { octave_idx_type neval; float abserr; return do_integrate (ier, neval, abserr); } virtual double integrate (octave_idx_type& ier, octave_idx_type& neval) { double abserr; return do_integrate (ier, neval, abserr); } virtual float float_integrate (octave_idx_type& ier, octave_idx_type& neval) { float abserr; return do_integrate (ier, neval, abserr); } virtual double integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr) { return do_integrate (ier, neval, abserr); } virtual float float_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr) { return do_integrate (ier, neval, abserr); } virtual double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr) = 0; virtual float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr) = 0; protected: integrand_fcn f; float_integrand_fcn ff; }; class OCTAVE_API DefQuad : public Quad { public: DefQuad (integrand_fcn fcn) : Quad (fcn), lower_limit (0.0), upper_limit (1.0), singularities () { } DefQuad (integrand_fcn fcn, double ll, double ul) : Quad (fcn), lower_limit (ll), upper_limit (ul), singularities () { } DefQuad (integrand_fcn fcn, double ll, double ul, const ColumnVector& sing) : Quad (fcn), lower_limit (ll), upper_limit (ul), singularities (sing) { } DefQuad (integrand_fcn fcn, const ColumnVector& sing) : Quad (fcn), lower_limit (0.0), upper_limit (1.0), singularities (sing) { } ~DefQuad (void) { } double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr); float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr); private: double lower_limit; double upper_limit; ColumnVector singularities; }; class OCTAVE_API IndefQuad : public Quad { public: enum IntegralType { bound_to_inf, neg_inf_to_bound, doubly_infinite }; IndefQuad (integrand_fcn fcn) : Quad (fcn), bound (0.0), type (bound_to_inf), integration_error (0) { } IndefQuad (integrand_fcn fcn, double b, IntegralType t) : Quad (fcn), bound (b), type (t), integration_error (0) { } ~IndefQuad (void) { } double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr); float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr); private: double bound; IntegralType type; int integration_error; }; class OCTAVE_API FloatDefQuad : public Quad { public: FloatDefQuad (float_integrand_fcn fcn) : Quad (fcn), lower_limit (0.0), upper_limit (1.0), singularities () { } FloatDefQuad (float_integrand_fcn fcn, float ll, float ul) : Quad (fcn), lower_limit (ll), upper_limit (ul), singularities () { } FloatDefQuad (float_integrand_fcn fcn, float ll, float ul, const FloatColumnVector& sing) : Quad (fcn), lower_limit (ll), upper_limit (ul), singularities (sing) { } FloatDefQuad (float_integrand_fcn fcn, const FloatColumnVector& sing) : Quad (fcn), lower_limit (0.0), upper_limit (1.0), singularities (sing) { } ~FloatDefQuad (void) { } double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr); float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr); private: float lower_limit; float upper_limit; FloatColumnVector singularities; }; class OCTAVE_API FloatIndefQuad : public Quad { public: enum IntegralType { bound_to_inf, neg_inf_to_bound, doubly_infinite }; FloatIndefQuad (float_integrand_fcn fcn) : Quad (fcn), bound (0.0), type (bound_to_inf), integration_error (0) { } FloatIndefQuad (float_integrand_fcn fcn, double b, IntegralType t) : Quad (fcn), bound (b), type (t), integration_error (0) { } ~FloatIndefQuad (void) { } double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr); float do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr); private: float bound; IntegralType type; int integration_error; }; #endif