Mercurial > hg > octave-nkf
view liboctave/CmplxSCHUR.cc @ 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) 1994-2012 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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "CmplxSCHUR.h" #include "f77-fcn.h" #include "lo-error.h" #include "oct-locbuf.h" extern "C" { F77_RET_T F77_FUNC (zgeesx, ZGEESX) (F77_CONST_CHAR_ARG_DECL, F77_CONST_CHAR_ARG_DECL, ComplexSCHUR::select_function, F77_CONST_CHAR_ARG_DECL, const octave_idx_type&, Complex*, const octave_idx_type&, octave_idx_type&, Complex*, Complex*, const octave_idx_type&, double&, double&, Complex*, const octave_idx_type&, double*, octave_idx_type*, octave_idx_type& F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); F77_RET_T F77_FUNC (zrsf2csf, ZRSF2CSF) (const octave_idx_type&, Complex *, Complex *, double *, double *); } static octave_idx_type select_ana (const Complex& a) { return a.real () < 0.0; } static octave_idx_type select_dig (const Complex& a) { return (abs (a) < 1.0); } octave_idx_type ComplexSCHUR::init (const ComplexMatrix& a, const std::string& ord, bool calc_unitary) { octave_idx_type a_nr = a.rows (); octave_idx_type a_nc = a.cols (); if (a_nr != a_nc) { (*current_liboctave_error_handler) ("ComplexSCHUR requires square matrix"); return -1; } else if (a_nr == 0) { schur_mat.clear (); unitary_mat.clear (); return 0; } // Workspace requirements may need to be fixed if any of the // following change. char jobvs; char sense = 'N'; char sort = 'N'; if (calc_unitary) jobvs = 'V'; else jobvs = 'N'; char ord_char = ord.empty () ? 'U' : ord[0]; if (ord_char == 'A' || ord_char == 'D' || ord_char == 'a' || ord_char == 'd') sort = 'S'; if (ord_char == 'A' || ord_char == 'a') selector = select_ana; else if (ord_char == 'D' || ord_char == 'd') selector = select_dig; else selector = 0; octave_idx_type n = a_nc; octave_idx_type lwork = 8 * n; octave_idx_type info; octave_idx_type sdim; double rconde; double rcondv; schur_mat = a; if (calc_unitary) unitary_mat.clear (n, n); Complex *s = schur_mat.fortran_vec (); Complex *q = unitary_mat.fortran_vec (); Array<double> rwork (dim_vector (n, 1)); double *prwork = rwork.fortran_vec (); Array<Complex> w (dim_vector (n, 1)); Complex *pw = w.fortran_vec (); Array<Complex> work (dim_vector (lwork, 1)); Complex *pwork = work.fortran_vec (); // BWORK is not referenced for non-ordered Schur. octave_idx_type ntmp = (ord_char == 'N' || ord_char == 'n') ? 0 : n; Array<octave_idx_type> bwork (dim_vector (ntmp, 1)); octave_idx_type *pbwork = bwork.fortran_vec (); F77_XFCN (zgeesx, ZGEESX, (F77_CONST_CHAR_ARG2 (&jobvs, 1), F77_CONST_CHAR_ARG2 (&sort, 1), selector, F77_CONST_CHAR_ARG2 (&sense, 1), n, s, n, sdim, pw, q, n, rconde, rcondv, pwork, lwork, prwork, pbwork, info F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); return info; } ComplexSCHUR::ComplexSCHUR (const ComplexMatrix& s, const ComplexMatrix& u) : schur_mat (s), unitary_mat (u), selector (0) { octave_idx_type n = s.rows (); if (s.columns () != n || u.rows () != n || u.columns () != n) (*current_liboctave_error_handler) ("schur: inconsistent matrix dimensions"); } ComplexSCHUR::ComplexSCHUR (const SCHUR& s) : schur_mat (s.schur_matrix ()), unitary_mat (s.unitary_matrix ()), selector (0) { octave_idx_type n = schur_mat.rows (); if (n > 0) { OCTAVE_LOCAL_BUFFER (double, c, n-1); OCTAVE_LOCAL_BUFFER (double, sx, n-1); F77_XFCN (zrsf2csf, ZRSF2CSF, (n, schur_mat.fortran_vec (), unitary_mat.fortran_vec (), c, sx)); } }