Mercurial > hg > octave-nkf
view liboctave/oct-sparse.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
/* Copyright (C) 2005-2012 David Bateman 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 (oct_sparse_h) #define oct_sparse_h 1 #if defined (HAVE_SUITESPARSE_AMD_H) #include <suitesparse/amd.h> #elif defined (HAVE_UFSPARSE_AMD_H) #include <ufsparse/amd.h> #elif defined (HAVE_AMD_AMD_H) #include <amd/amd.h> #elif defined (HAVE_AMD_H) #include <amd.h> #endif #if defined (HAVE_SUITESPARSE_UMFPACK_H) #include <suitesparse/umfpack.h> #elif defined (HAVE_UFSPARSE_UMFPACK_H) #include <ufsparse/umfpack.h> #elif defined (HAVE_UMFPACK_UMFPACK_H) #include <umfpack/umfpack.h> #elif defined (HAVE_UMFPACK_H) #include <umfpack.h> #endif #if defined (HAVE_SUITESPARSE_COLAMD_H) #include <suitesparse/colamd.h> #elif defined (HAVE_UFSPARSE_COLAMD_H) #include <ufsparse/colamd.h> #elif defined (HAVE_COLAMD_COLAMD_H) #include <colamd/colamd.h> #elif defined (HAVE_COLAMD_H) #include <colamd.h> #endif #if defined (HAVE_SUITESPARSE_CCOLAMD_H) #include <suitesparse/ccolamd.h> #elif defined (HAVE_UFSPARSE_CCOLAMD_H) #include <ufsparse/ccolamd.h> #elif defined (HAVE_CCOLAMD_CCOLAMD_H) #include <ccolamd/ccolamd.h> #elif defined (HAVE_CCOLAMD_H) #include <ccolamd.h> #endif #if defined (HAVE_SUITESPARSE_CHOLMOD_H) #include <suitesparse/cholmod.h> #elif defined (HAVE_UFSPARSE_CHOLMOD_H) #include <ufsparse/cholmod.h> #elif defined (HAVE_CHOLMOD_CHOLMOD_H) #include <cholmod/cholmod.h> #elif defined (HAVE_CHOLMOD_H) #include <cholmod.h> #endif #if defined (HAVE_SUITESPARSE_CS_H) #include <suitesparse/cs.h> #elif defined (HAVE_UFSPARSE_CS_H) #include <ufsparse/cs.h> #elif defined (HAVE_CXSPARSE_CS_H) #include <cxsparse/cs.h> #elif defined (HAVE_CS_H) #include <cs.h> #endif #if (defined (HAVE_SUITESPARSE_CHOLMOD_H) \ || defined (HAVE_UFSPARSE_CHOLMOD_H) \ || defined (HAVE_CHOLMOD_CHOLMOD_H) \ || defined (HAVE_CHOLMOD_H)) #ifdef IDX_TYPE_LONG #define CHOLMOD_NAME(name) cholmod_l_ ## name #else #define CHOLMOD_NAME(name) cholmod_ ## name #endif #endif #endif