Mercurial > octave-nkf
view liboctave/array/CColVector.cc @ 20267: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 |
line wrap: on
line source
// ColumnVector manipulations. /* Copyright (C) 1994-2015 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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <iostream> #include "Array-util.h" #include "f77-fcn.h" #include "functor.h" #include "lo-error.h" #include "mx-base.h" #include "mx-inlines.cc" #include "oct-cmplx.h" // Fortran functions we call. extern "C" { F77_RET_T F77_FUNC (zgemv, ZGEMV) (F77_CONST_CHAR_ARG_DECL, const octave_idx_type&, const octave_idx_type&, const Complex&, const Complex*, const octave_idx_type&, const Complex*, const octave_idx_type&, const Complex&, Complex*, const octave_idx_type& F77_CHAR_ARG_LEN_DECL); } // Complex Column Vector class ComplexColumnVector::ComplexColumnVector (const ColumnVector& a) : MArray<Complex> (a) { } bool ComplexColumnVector::operator == (const ComplexColumnVector& a) const { octave_idx_type len = numel (); if (len != a.numel ()) return 0; return mx_inline_equal (len, data (), a.data ()); } bool ComplexColumnVector::operator != (const ComplexColumnVector& a) const { return !(*this == a); } // destructive insert/delete/reorder operations ComplexColumnVector& ComplexColumnVector::insert (const ColumnVector& a, octave_idx_type r) { octave_idx_type a_len = a.numel (); if (r < 0 || r + a_len > numel ()) { (*current_liboctave_error_handler) ("range error for insert"); return *this; } if (a_len > 0) { make_unique (); for (octave_idx_type i = 0; i < a_len; i++) xelem (r+i) = a.elem (i); } return *this; } ComplexColumnVector& ComplexColumnVector::insert (const ComplexColumnVector& a, octave_idx_type r) { octave_idx_type a_len = a.numel (); if (r < 0 || r + a_len > numel ()) { (*current_liboctave_error_handler) ("range error for insert"); return *this; } if (a_len > 0) { make_unique (); for (octave_idx_type i = 0; i < a_len; i++) xelem (r+i) = a.elem (i); } return *this; } ComplexColumnVector& ComplexColumnVector::fill (double val) { octave_idx_type len = numel (); if (len > 0) { make_unique (); for (octave_idx_type i = 0; i < len; i++) xelem (i) = val; } return *this; } ComplexColumnVector& ComplexColumnVector::fill (const Complex& val) { octave_idx_type len = numel (); if (len > 0) { make_unique (); for (octave_idx_type i = 0; i < len; i++) xelem (i) = val; } return *this; } ComplexColumnVector& ComplexColumnVector::fill (double val, octave_idx_type r1, octave_idx_type r2) { octave_idx_type len = numel (); if (r1 < 0 || r2 < 0 || r1 >= len || r2 >= len) { (*current_liboctave_error_handler) ("range error for fill"); return *this; } if (r1 > r2) { std::swap (r1, r2); } if (r2 >= r1) { make_unique (); for (octave_idx_type i = r1; i <= r2; i++) xelem (i) = val; } return *this; } ComplexColumnVector& ComplexColumnVector::fill (const Complex& val, octave_idx_type r1, octave_idx_type r2) { octave_idx_type len = numel (); if (r1 < 0 || r2 < 0 || r1 >= len || r2 >= len) { (*current_liboctave_error_handler) ("range error for fill"); return *this; } if (r1 > r2) { std::swap (r1, r2); } if (r2 >= r1) { make_unique (); for (octave_idx_type i = r1; i <= r2; i++) xelem (i) = val; } return *this; } ComplexColumnVector ComplexColumnVector::stack (const ColumnVector& a) const { octave_idx_type len = numel (); octave_idx_type nr_insert = len; ComplexColumnVector retval (len + a.numel ()); retval.insert (*this, 0); retval.insert (a, nr_insert); return retval; } ComplexColumnVector ComplexColumnVector::stack (const ComplexColumnVector& a) const { octave_idx_type len = numel (); octave_idx_type nr_insert = len; ComplexColumnVector retval (len + a.numel ()); retval.insert (*this, 0); retval.insert (a, nr_insert); return retval; } ComplexRowVector ComplexColumnVector::hermitian (void) const { return MArray<Complex>::hermitian (std::conj); } ComplexRowVector ComplexColumnVector::transpose (void) const { return MArray<Complex>::transpose (); } ColumnVector ComplexColumnVector::abs (void) const { return do_mx_unary_map<double, Complex, std::abs> (*this); } ComplexColumnVector conj (const ComplexColumnVector& a) { return do_mx_unary_map<Complex, Complex, std::conj<double> > (a); } // resize is the destructive equivalent for this one ComplexColumnVector ComplexColumnVector::extract (octave_idx_type r1, octave_idx_type r2) const { if (r1 > r2) { std::swap (r1, r2); } octave_idx_type new_r = r2 - r1 + 1; ComplexColumnVector result (new_r); for (octave_idx_type i = 0; i < new_r; i++) result.elem (i) = elem (r1+i); return result; } ComplexColumnVector ComplexColumnVector::extract_n (octave_idx_type r1, octave_idx_type n) const { ComplexColumnVector result (n); for (octave_idx_type i = 0; i < n; i++) result.elem (i) = elem (r1+i); return result; } // column vector by column vector -> column vector operations ComplexColumnVector& ComplexColumnVector::operator += (const ColumnVector& a) { octave_idx_type len = numel (); octave_idx_type a_len = a.numel (); if (len != a_len) { gripe_nonconformant ("operator +=", len, a_len); return *this; } if (len == 0) return *this; Complex *d = fortran_vec (); // Ensures only one reference to my privates! mx_inline_add2 (len, d, a.data ()); return *this; } ComplexColumnVector& ComplexColumnVector::operator -= (const ColumnVector& a) { octave_idx_type len = numel (); octave_idx_type a_len = a.numel (); if (len != a_len) { gripe_nonconformant ("operator -=", len, a_len); return *this; } if (len == 0) return *this; Complex *d = fortran_vec (); // Ensures only one reference to my privates! mx_inline_sub2 (len, d, a.data ()); return *this; } // matrix by column vector -> column vector operations ComplexColumnVector operator * (const ComplexMatrix& m, const ColumnVector& a) { ComplexColumnVector tmp (a); return m * tmp; } ComplexColumnVector operator * (const ComplexMatrix& m, const ComplexColumnVector& a) { ComplexColumnVector retval; octave_idx_type nr = m.rows (); octave_idx_type nc = m.cols (); octave_idx_type a_len = a.numel (); if (nc != a_len) gripe_nonconformant ("operator *", nr, nc, a_len, 1); else { retval.clear (nr); if (nr != 0) { if (nc == 0) retval.fill (0.0); else { Complex *y = retval.fortran_vec (); F77_XFCN (zgemv, ZGEMV, (F77_CONST_CHAR_ARG2 ("N", 1), nr, nc, 1.0, m.data (), nr, a.data (), 1, 0.0, y, 1 F77_CHAR_ARG_LEN (1))); } } } return retval; } // matrix by column vector -> column vector operations ComplexColumnVector operator * (const Matrix& m, const ComplexColumnVector& a) { ComplexMatrix tmp (m); return tmp * a; } // diagonal matrix by column vector -> column vector operations ComplexColumnVector operator * (const DiagMatrix& m, const ComplexColumnVector& a) { octave_idx_type nr = m.rows (); octave_idx_type nc = m.cols (); octave_idx_type a_len = a.numel (); if (nc != a_len) { gripe_nonconformant ("operator *", nr, nc, a_len, 1); return ComplexColumnVector (); } if (nc == 0 || nr == 0) return ComplexColumnVector (0); ComplexColumnVector result (nr); for (octave_idx_type i = 0; i < a_len; i++) result.elem (i) = a.elem (i) * m.elem (i, i); for (octave_idx_type i = a_len; i < nr; i++) result.elem (i) = 0.0; return result; } ComplexColumnVector operator * (const ComplexDiagMatrix& m, const ColumnVector& a) { octave_idx_type nr = m.rows (); octave_idx_type nc = m.cols (); octave_idx_type a_len = a.numel (); if (nc != a_len) { gripe_nonconformant ("operator *", nr, nc, a_len, 1); return ComplexColumnVector (); } if (nc == 0 || nr == 0) return ComplexColumnVector (0); ComplexColumnVector result (nr); for (octave_idx_type i = 0; i < a_len; i++) result.elem (i) = a.elem (i) * m.elem (i, i); for (octave_idx_type i = a_len; i < nr; i++) result.elem (i) = 0.0; return result; } ComplexColumnVector operator * (const ComplexDiagMatrix& m, const ComplexColumnVector& a) { octave_idx_type nr = m.rows (); octave_idx_type nc = m.cols (); octave_idx_type a_len = a.numel (); if (nc != a_len) { gripe_nonconformant ("operator *", nr, nc, a_len, 1); return ComplexColumnVector (); } if (nc == 0 || nr == 0) return ComplexColumnVector (0); ComplexColumnVector result (nr); for (octave_idx_type i = 0; i < a_len; i++) result.elem (i) = a.elem (i) * m.elem (i, i); for (octave_idx_type i = a_len; i < nr; i++) result.elem (i) = 0.0; return result; } // other operations Complex ComplexColumnVector::min (void) const { octave_idx_type len = numel (); if (len == 0) return 0.0; Complex res = elem (0); double absres = std::abs (res); for (octave_idx_type i = 1; i < len; i++) if (std::abs (elem (i)) < absres) { res = elem (i); absres = std::abs (res); } return res; } Complex ComplexColumnVector::max (void) const { octave_idx_type len = numel (); if (len == 0) return 0.0; Complex res = elem (0); double absres = std::abs (res); for (octave_idx_type i = 1; i < len; i++) if (std::abs (elem (i)) > absres) { res = elem (i); absres = std::abs (res); } return res; } // i/o std::ostream& operator << (std::ostream& os, const ComplexColumnVector& a) { // int field_width = os.precision () + 7; for (octave_idx_type i = 0; i < a.numel (); i++) os << /* setw (field_width) << */ a.elem (i) << "\n"; return os; } std::istream& operator >> (std::istream& is, ComplexColumnVector& a) { octave_idx_type len = a.numel (); if (len > 0) { double tmp; for (octave_idx_type i = 0; i < len; i++) { is >> tmp; if (is) a.elem (i) = tmp; else break; } } return is; }