Mercurial > hg > octave-nkf
view liboctave/MDiagArray2.h @ 14557:e8e86ae3abbc
make diag (x, m, n) return a proper diagonal matrix object (bug #36099)
* Array.h, Array.cc (Array<T>::diag (octave_idx_type, octave_idx_type)
const): New function.
* CMatrix.h, CMatrix.cc (ComplexMatrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* dMatrix.h, dMatrix.cc (Matrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* fCMatrix.h, fCMatrix.cc (FloatComplexMatrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* fMatrix.h, fMatrix.cc (FloatMatrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* CNDArray.cc, CNDArray.h (ComplexNDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* boolNDArray.cc, boolNDArray.h (boolNDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* chNDArray.cc, chNDArray.h (charNDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* dNDArray.cc, dNDArray.h (NDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* fCNDArray.cc, fCNDArray.h (FloatComplexNDArray::diag
(octave_idx_type, octave_idx_type) const): New forwarding function.
* fNDArray.cc, fNDArray.h (FloatNDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* intNDArray.cc, intNDArray.h (intNDArray<T>::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* Cell.cc, Cell.h (Cell::diag (octave_idx_type, octave_idx_type)
const): New function.
* ov.h (octave_value::diag (octave_idx_type, octave_idx_type)):
New function.
* ov-base.h, ov-base.cc (octave_base_value::diag (octave_idx_type,
octave_idx_type) const): New virtual function and default implementation.
* ov-base-mat.h (octave_base_matrix<T>::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-base-scalar.cc, ov-base-scalar.h (octave_base_scalar<T>::diag
(octave_idx_type, octave_idx_type)): New function.
* ov-complex.cc, ov-complex.h (octave_complex::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-cx-mat.cc, ov-complex.h (octave_complex_matrix::diag
(octave_idx_type, octave_idx_type) const): New function.
* ov-float.cc, ov-float.h (octave_float_scalar::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-flt-complex.cc, ov-flt-complex.h (octave_float_complex::diag
(octave_idx_type, octave_idx_type) const): New function.
* ov-flt-cx-mat.cc, ov-flt-cx-mat.h (octave_float_complex_matrix::diag
(octave_idx_type, octave_idx_type) const): New function.
* ov-flt-re-mat.cc, ov-flt-re-mat.h (octave_float_matrix::diag
(octave_idx_type, octave_idx_type) const): New function.
* ov-range.cc, ov-range.h (octave_range::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-re-mat.cc, ov-re-mat.h (octave_matrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-scalar.cc, ov-scalar.h (octave_scalar::diag (octave_idx_type,
octave_idx_type) const): New function.
* data.cc (Fdiag): Use two-arg octave_value::diag method for
dispatching. New tests.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 12 Apr 2012 16:27:39 -0400 |
parents | 72c96de7a403 |
children |
line wrap: on
line source
// Template array classes with like-type math ops /* Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2010 VZLU Prague 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_MDiagArray2_h) #define octave_MDiagArray2_h 1 #include "DiagArray2.h" #include "MArray.h" // Two dimensional diagonal array with math ops. // But first, some preprocessor abuse... #include "MArray-decl.h" MDIAGARRAY2_OPS_FORWARD_DECLS (MDiagArray2, ) template <class T> class MDiagArray2 : public DiagArray2<T> { public: MDiagArray2 (void) : DiagArray2<T> () { } MDiagArray2 (octave_idx_type r, octave_idx_type c) : DiagArray2<T> (r, c) { } MDiagArray2 (octave_idx_type r, octave_idx_type c, const T& val) : DiagArray2<T> (r, c, val) { } MDiagArray2 (const MDiagArray2<T>& a) : DiagArray2<T> (a) { } MDiagArray2 (const DiagArray2<T>& a) : DiagArray2<T> (a) { } template <class U> MDiagArray2 (const DiagArray2<U>& a) : DiagArray2<T> (a) { } explicit MDiagArray2 (const Array<T>& a) : DiagArray2<T> (a) { } MDiagArray2 (const Array<T>& a, octave_idx_type r, octave_idx_type c) : DiagArray2<T> (a, r, c) { } ~MDiagArray2 (void) { } MDiagArray2<T>& operator = (const MDiagArray2<T>& a) { DiagArray2<T>::operator = (a); return *this; } MArray<T> array_value () const { return DiagArray2<T>::array_value (); } octave_idx_type nnz (void) const { octave_idx_type retval = 0; const T *d = this->data (); octave_idx_type nel = this->length (); for (octave_idx_type i = 0; i < nel; i++) { if (d[i] != T ()) retval++; } return retval; } MArray<T> diag (octave_idx_type k = 0) const { return DiagArray2<T>::diag (k); } MDiagArray2<T> transpose (void) const { return DiagArray2<T>::transpose (); } MDiagArray2<T> hermitian (T (*fcn) (const T&) = 0) const { return DiagArray2<T>::hermitian (fcn); } bool is_multiple_of_identity (T val) const; // Currently, the OPS functions don't need to be friends, but that // may change. MDIAGARRAY2_OPS_FRIEND_DECLS (MDiagArray2, ) }; #endif