Mercurial > hg > octave-nkf
view liboctave/array/fDiagMatrix.cc @ 20442:a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
* liboctave/array/Array.h (Array::length): deprecate for ::numel.
* liboctave/array/Sparse.h (Sparse::length): deprecate for ::numel.
* libgui/graphics/QtHandlesUtils.cc, libgui/src/octave-qt-link.cc,
libinterp/corefcn/Cell.cc, libinterp/corefcn/__contourc__.cc,
libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc,
libinterp/corefcn/cellfun.cc, libinterp/corefcn/daspk.cc,
libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc,
libinterp/corefcn/data.cc, libinterp/corefcn/filter.cc,
libinterp/corefcn/find.cc, libinterp/corefcn/gl-render.cc,
libinterp/corefcn/gl-render.h, libinterp/corefcn/graphics.cc,
libinterp/corefcn/graphics.in.h, libinterp/corefcn/help.cc,
libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc,
libinterp/corefcn/load-path.cc, libinterp/corefcn/load-save.cc,
libinterp/corefcn/ls-oct-ascii.h, libinterp/corefcn/lsode.cc,
libinterp/corefcn/matrix_type.cc, libinterp/corefcn/oct-hist.cc,
libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-map.h,
libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-stream.cc,
libinterp/corefcn/oct-stream.h, libinterp/corefcn/pr-output.cc,
libinterp/corefcn/quadcc.cc, libinterp/corefcn/rand.cc,
libinterp/corefcn/regexp.cc, libinterp/corefcn/strfns.cc,
libinterp/corefcn/sub2ind.cc, libinterp/corefcn/symtab.h,
libinterp/corefcn/syscalls.cc, libinterp/corefcn/tsearch.cc,
libinterp/corefcn/urlwrite.cc, libinterp/corefcn/utils.cc,
libinterp/corefcn/variables.cc, libinterp/corefcn/xdiv.cc,
libinterp/corefcn/xpow.cc, libinterp/dldfcn/__glpk__.cc,
libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__magick_read__.cc,
libinterp/dldfcn/audiodevinfo.cc, libinterp/dldfcn/ccolamd.cc,
libinterp/dldfcn/colamd.cc, libinterp/octave-value/ov-cell.cc,
libinterp/octave-value/ov-class.cc, libinterp/octave-value/ov-class.h,
libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-java.cc,
libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-struct.cc,
libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov.cc,
libinterp/operators/op-int.h, libinterp/parse-tree/pt-pr-code.cc,
liboctave/array/Array-util.cc, liboctave/array/Array.cc,
liboctave/array/CColVector.cc, liboctave/array/CDiagMatrix.cc,
liboctave/array/CMatrix.cc, liboctave/array/CRowVector.cc,
liboctave/array/DiagArray2.cc, liboctave/array/DiagArray2.h,
liboctave/array/MArray.cc, liboctave/array/PermMatrix.cc,
liboctave/array/PermMatrix.h, liboctave/array/Sparse.cc,
liboctave/array/boolMatrix.cc, liboctave/array/chMatrix.cc,
liboctave/array/chNDArray.cc, liboctave/array/dColVector.cc,
liboctave/array/dDiagMatrix.cc, liboctave/array/dMatrix.cc,
liboctave/array/dRowVector.cc, liboctave/array/fCColVector.cc,
liboctave/array/fCDiagMatrix.cc, liboctave/array/fCMatrix.cc,
liboctave/array/fCRowVector.cc, liboctave/array/fColVector.cc,
liboctave/array/fDiagMatrix.cc, liboctave/array/fMatrix.cc,
liboctave/array/fRowVector.cc, liboctave/array/idx-vector.cc,
liboctave/array/intNDArray.cc, liboctave/numeric/CmplxCHOL.cc,
liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxQR.cc,
liboctave/numeric/DASPK.cc, liboctave/numeric/DASRT.cc,
liboctave/numeric/DASSL.cc, liboctave/numeric/LSODE.cc,
liboctave/numeric/ODES.cc, liboctave/numeric/ODES.h,
liboctave/numeric/base-dae.h, liboctave/numeric/base-lu.cc,
liboctave/numeric/dbleCHOL.cc, liboctave/numeric/dbleLU.cc,
liboctave/numeric/dbleQR.cc, liboctave/numeric/eigs-base.cc,
liboctave/numeric/fCmplxCHOL.cc, liboctave/numeric/fCmplxLU.cc,
liboctave/numeric/fCmplxQR.cc, liboctave/numeric/floatCHOL.cc,
liboctave/numeric/floatLU.cc, liboctave/numeric/floatQR.cc,
liboctave/numeric/lo-specfun.cc, liboctave/numeric/oct-rand.cc,
liboctave/numeric/oct-spparms.cc, liboctave/numeric/sparse-base-chol.cc,
liboctave/operators/mx-inlines.cc, liboctave/system/file-ops.cc,
liboctave/util/glob-match.h, liboctave/util/kpse.cc,
liboctave/util/lo-regexp.cc, liboctave/util/oct-glob.cc,
liboctave/util/pathsearch.cc, liboctave/util/str-vec.cc,
liboctave/util/str-vec.h, liboctave/util/url-transfer.cc: replace all usage
of Array::length() and Sparse::length() with ::numel().
author | Carnë Draug <carandraug@octave.org> |
---|---|
date | Sat, 30 May 2015 03:14:07 +0100 |
parents | 4197fc428c7d |
children | f61c67865d9f |
line wrap: on
line source
// FloatDiagMatrix manipulations. /* Copyright (C) 1994-2015 John W. Eaton Copyright (C) 2009 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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <iostream> #include "Array-util.h" #include "lo-error.h" #include "mx-base.h" #include "mx-inlines.cc" #include "oct-cmplx.h" // Diagonal Matrix class. bool FloatDiagMatrix::operator == (const FloatDiagMatrix& a) const { if (rows () != a.rows () || cols () != a.cols ()) return 0; return mx_inline_equal (length (), data (), a.data ()); } bool FloatDiagMatrix::operator != (const FloatDiagMatrix& a) const { return !(*this == a); } FloatDiagMatrix& FloatDiagMatrix::fill (float val) { for (octave_idx_type i = 0; i < length (); i++) elem (i, i) = val; return *this; } FloatDiagMatrix& FloatDiagMatrix::fill (float val, octave_idx_type beg, octave_idx_type end) { if (beg < 0 || end >= length () || end < beg) { (*current_liboctave_error_handler) ("range error for fill"); return *this; } for (octave_idx_type i = beg; i <= end; i++) elem (i, i) = val; return *this; } FloatDiagMatrix& FloatDiagMatrix::fill (const FloatColumnVector& a) { octave_idx_type len = length (); if (a.numel () != len) { (*current_liboctave_error_handler) ("range error for fill"); return *this; } for (octave_idx_type i = 0; i < len; i++) elem (i, i) = a.elem (i); return *this; } FloatDiagMatrix& FloatDiagMatrix::fill (const FloatRowVector& a) { octave_idx_type len = length (); if (a.numel () != len) { (*current_liboctave_error_handler) ("range error for fill"); return *this; } for (octave_idx_type i = 0; i < len; i++) elem (i, i) = a.elem (i); return *this; } FloatDiagMatrix& FloatDiagMatrix::fill (const FloatColumnVector& a, octave_idx_type beg) { octave_idx_type a_len = a.numel (); if (beg < 0 || beg + a_len >= length ()) { (*current_liboctave_error_handler) ("range error for fill"); return *this; } for (octave_idx_type i = 0; i < a_len; i++) elem (i+beg, i+beg) = a.elem (i); return *this; } FloatDiagMatrix& FloatDiagMatrix::fill (const FloatRowVector& a, octave_idx_type beg) { octave_idx_type a_len = a.numel (); if (beg < 0 || beg + a_len >= length ()) { (*current_liboctave_error_handler) ("range error for fill"); return *this; } for (octave_idx_type i = 0; i < a_len; i++) elem (i+beg, i+beg) = a.elem (i); return *this; } FloatDiagMatrix FloatDiagMatrix::abs (void) const { return FloatDiagMatrix (extract_diag ().abs (), rows (), columns ()); } FloatDiagMatrix real (const FloatComplexDiagMatrix& a) { return FloatDiagMatrix (real (a.extract_diag ()), a.rows (), a.columns ()); } FloatDiagMatrix imag (const FloatComplexDiagMatrix& a) { return FloatDiagMatrix (imag (a.extract_diag ()), a.rows (), a.columns ()); } FloatMatrix FloatDiagMatrix::extract (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) const { if (r1 > r2) { std::swap (r1, r2); } if (c1 > c2) { std::swap (c1, c2); } octave_idx_type new_r = r2 - r1 + 1; octave_idx_type new_c = c2 - c1 + 1; FloatMatrix result (new_r, new_c); for (octave_idx_type j = 0; j < new_c; j++) for (octave_idx_type i = 0; i < new_r; i++) result.elem (i, j) = elem (r1+i, c1+j); return result; } // extract row or column i. FloatRowVector FloatDiagMatrix::row (octave_idx_type i) const { octave_idx_type r = rows (); octave_idx_type c = cols (); if (i < 0 || i >= r) { (*current_liboctave_error_handler) ("invalid row selection"); return FloatRowVector (); } FloatRowVector retval (c, 0.0); if (r <= c || (r > c && i < c)) retval.elem (i) = elem (i, i); return retval; } FloatRowVector FloatDiagMatrix::row (char *s) const { if (! s) { (*current_liboctave_error_handler) ("invalid row selection"); return FloatRowVector (); } char c = *s; if (c == 'f' || c == 'F') return row (static_cast<octave_idx_type>(0)); else if (c == 'l' || c == 'L') return row (rows () - 1); else { (*current_liboctave_error_handler) ("invalid row selection"); return FloatRowVector (); } } FloatColumnVector FloatDiagMatrix::column (octave_idx_type i) const { octave_idx_type r = rows (); octave_idx_type c = cols (); if (i < 0 || i >= c) { (*current_liboctave_error_handler) ("invalid column selection"); return FloatColumnVector (); } FloatColumnVector retval (r, 0.0); if (r >= c || (r < c && i < r)) retval.elem (i) = elem (i, i); return retval; } FloatColumnVector FloatDiagMatrix::column (char *s) const { if (! s) { (*current_liboctave_error_handler) ("invalid column selection"); return FloatColumnVector (); } char c = *s; if (c == 'f' || c == 'F') return column (static_cast<octave_idx_type>(0)); else if (c == 'l' || c == 'L') return column (cols () - 1); else { (*current_liboctave_error_handler) ("invalid column selection"); return FloatColumnVector (); } } FloatDiagMatrix FloatDiagMatrix::inverse (void) const { octave_idx_type info; return inverse (info); } FloatDiagMatrix FloatDiagMatrix::inverse (octave_idx_type &info) const { octave_idx_type r = rows (); octave_idx_type c = cols (); octave_idx_type len = length (); if (r != c) { (*current_liboctave_error_handler) ("inverse requires square matrix"); return FloatDiagMatrix (); } FloatDiagMatrix retval (r, c); info = 0; for (octave_idx_type i = 0; i < len; i++) { if (elem (i, i) == 0.0) { info = -1; return *this; } else retval.elem (i, i) = 1.0 / elem (i, i); } return retval; } FloatDiagMatrix FloatDiagMatrix::pseudo_inverse (float tol) const { octave_idx_type r = rows (); octave_idx_type c = cols (); octave_idx_type len = length (); FloatDiagMatrix retval (c, r); for (octave_idx_type i = 0; i < len; i++) { float val = std::abs (elem (i, i)); if (val < tol || val == 0.0f) retval.elem (i, i) = 0.0f; else retval.elem (i, i) = 1.0f / elem (i, i); } return retval; } // diagonal matrix by diagonal matrix -> diagonal matrix operations // diagonal matrix by diagonal matrix -> diagonal matrix operations FloatDiagMatrix operator * (const FloatDiagMatrix& a, const FloatDiagMatrix& b) { octave_idx_type a_nr = a.rows (); octave_idx_type a_nc = a.cols (); octave_idx_type b_nr = b.rows (); octave_idx_type b_nc = b.cols (); if (a_nc != b_nr) gripe_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc); FloatDiagMatrix c (a_nr, b_nc); octave_idx_type len = c.length (); octave_idx_type lenm = len < a_nc ? len : a_nc; for (octave_idx_type i = 0; i < lenm; i++) c.dgxelem (i) = a.dgelem (i) * b.dgelem (i); for (octave_idx_type i = lenm; i < len; i++) c.dgxelem (i) = 0.0f; return c; } // other operations FloatDET FloatDiagMatrix::determinant (void) const { FloatDET det (1.0f); if (rows () != cols ()) { (*current_liboctave_error_handler) ("determinant requires square matrix"); det = 0.0f; } else { octave_idx_type len = length (); for (octave_idx_type i = 0; i < len; i++) det *= elem (i, i); } return det; } float FloatDiagMatrix::rcond (void) const { FloatColumnVector av = extract_diag (0).map<float> (fabsf); float amx = av.max (); float amn = av.min (); return amx == 0 ? 0.0f : amn / amx; } std::ostream& operator << (std::ostream& os, const FloatDiagMatrix& a) { // int field_width = os.precision () + 7; for (octave_idx_type i = 0; i < a.rows (); i++) { for (octave_idx_type j = 0; j < a.cols (); j++) { if (i == j) os << " " /* setw (field_width) */ << a.elem (i, i); else os << " " /* setw (field_width) */ << 0.0; } os << "\n"; } return os; }