Mercurial > hg > octave-nkf
view liboctave/chMatrix.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 | 13cc11418393 |
line wrap: on
line source
/* Copyright (C) 1995-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_chMatrix_int_h) #define octave_chMatrix_int_h 1 #include <string> #include "Array.h" #include "mx-defs.h" #include "mx-op-decl.h" #include "str-vec.h" class OCTAVE_API charMatrix : public Array<char> { friend class ComplexMatrix; public: charMatrix (void) : Array<char> () { } charMatrix (octave_idx_type r, octave_idx_type c) : Array<char> (dim_vector (r, c)) { } charMatrix (octave_idx_type r, octave_idx_type c, char val) : Array<char> (dim_vector (r, c), val) { } charMatrix (const dim_vector& dv) : Array<char> (dv) { } charMatrix (const dim_vector& dv, char val) : Array<char> (dv, val) { } charMatrix (const Array<char>& a) : Array<char> (a.as_matrix ()) { } charMatrix (const charMatrix& a) : Array<char> (a) { } charMatrix (char c); charMatrix (const char *s); charMatrix (const std::string& s); charMatrix (const string_vector& s, char fill_value = '\0'); charMatrix& operator = (const charMatrix& a) { Array<char>::operator = (a); return *this; } bool operator == (const charMatrix& a) const; bool operator != (const charMatrix& a) const; charMatrix transpose (void) const { return Array<char>::transpose (); } // destructive insert/delete/reorder operations charMatrix& insert (const char *s, octave_idx_type r, octave_idx_type c); charMatrix& insert (const charMatrix& a, octave_idx_type r, octave_idx_type c); std::string row_as_string (octave_idx_type, bool strip_ws = false) const; // resize is the destructive equivalent for this one charMatrix extract (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) const; void resize (octave_idx_type nr, octave_idx_type nc, char rfv = resize_fill_value ()) { Array<char>::resize (dim_vector (nr, nc), rfv); } charMatrix diag (octave_idx_type k = 0) const; boolMatrix all (int dim = -1) const; boolMatrix any (int dim = -1) const; #if 0 // i/o friend std::ostream& operator << (std::ostream& os, const Matrix& a); friend std::istream& operator >> (std::istream& is, Matrix& a); #endif static char resize_fill_value (void) { return '\0'; } }; MS_CMP_OP_DECLS (charMatrix, char, OCTAVE_API) MS_BOOL_OP_DECLS (charMatrix, char, OCTAVE_API) SM_CMP_OP_DECLS (char, charMatrix, OCTAVE_API) SM_BOOL_OP_DECLS (char, charMatrix, OCTAVE_API) MM_CMP_OP_DECLS (charMatrix, charMatrix, OCTAVE_API) MM_BOOL_OP_DECLS (charMatrix, charMatrix, OCTAVE_API) #endif