Mercurial > octave
view liboctave/array/fColVector.h @ 30902:972959edc3ff
Allow sub2ind() to accept indices outside the size of the input subscripts (bug #62184)
* NEWS.8.md: Announce change in Matlab Compatibility section.
* sub2ind.cc: Add '#include "utility"' for access to std::swap.
* sub2ind.cc (Fsub2ind): Check nargout to figure out ndims of output.
For special case of vector (1-dimension), put in code to guarantee a
row vector output. Add BIST tests for bug #62184. Remove input
validation BIST which no longer applies.
* Array-util.cc (ind2sub): Remove input validation requiring index to
be within range of subscript size. Adjust code to put all remaining
elements in the final output dimension.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 05 Apr 2022 15:12:34 -0700 |
parents | 796f54d4ddbf |
children | 597f3ee61a48 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 1994-2022 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // 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 // <https://www.gnu.org/licenses/>. // //////////////////////////////////////////////////////////////////////// #if ! defined (octave_fColVector_h) #define octave_fColVector_h 1 #include "octave-config.h" #include "MArray.h" #include "mx-defs.h" class OCTAVE_API FloatColumnVector : public MArray<float> { public: FloatColumnVector (void) : MArray<float> (dim_vector (0, 1)) { } explicit FloatColumnVector (octave_idx_type n) : MArray<float> (dim_vector (n, 1)) { } explicit FloatColumnVector (const dim_vector& dv) : MArray<float> (dv.as_column ()) { } FloatColumnVector (octave_idx_type n, float val) : MArray<float> (dim_vector (n, 1), val) { } FloatColumnVector (const FloatColumnVector& a) : MArray<float> (a) { } FloatColumnVector (const MArray<float>& a) : MArray<float> (a.as_column ()) { } FloatColumnVector (const Array<float>& a) : MArray<float> (a.as_column ()) { } FloatColumnVector& operator = (const FloatColumnVector& a) { MArray<float>::operator = (a); return *this; } OCTAVE_API bool operator == (const FloatColumnVector& a) const; OCTAVE_API bool operator != (const FloatColumnVector& a) const; // destructive insert/delete/reorder operations OCTAVE_API FloatColumnVector& insert (const FloatColumnVector& a, octave_idx_type r); OCTAVE_API FloatColumnVector& fill (float val); OCTAVE_API FloatColumnVector& fill (float val, octave_idx_type r1, octave_idx_type r2); OCTAVE_API FloatColumnVector stack (const FloatColumnVector& a) const; OCTAVE_API FloatRowVector transpose (void) const; friend OCTAVE_API FloatColumnVector real (const FloatComplexColumnVector& a); friend OCTAVE_API FloatColumnVector imag (const FloatComplexColumnVector& a); // resize is the destructive equivalent for this one OCTAVE_API FloatColumnVector extract (octave_idx_type r1, octave_idx_type r2) const; OCTAVE_API FloatColumnVector extract_n (octave_idx_type r1, octave_idx_type n) const; // matrix by column vector -> column vector operations friend OCTAVE_API FloatColumnVector operator * (const FloatMatrix& a, const FloatColumnVector& b); // diagonal matrix by column vector -> column vector operations friend OCTAVE_API FloatColumnVector operator * (const FloatDiagMatrix& a, const FloatColumnVector& b); // other operations OCTAVE_API float min (void) const; OCTAVE_API float max (void) const; OCTAVE_API FloatColumnVector abs (void) const; // i/o friend OCTAVE_API std::ostream& operator << (std::ostream& os, const FloatColumnVector& a); friend OCTAVE_API std::istream& operator >> (std::istream& is, FloatColumnVector& a); void resize (octave_idx_type n, const float& rfv = 0) { Array<float>::resize (dim_vector (n, 1), rfv); } void clear (octave_idx_type n) { Array<float>::clear (n, 1); } }; // Publish externally used friend functions. extern OCTAVE_API FloatColumnVector real (const FloatComplexColumnVector& a); extern OCTAVE_API FloatColumnVector imag (const FloatComplexColumnVector& a); MARRAY_FORWARD_DEFS (MArray, FloatColumnVector, float) #endif