Mercurial > hg > octave-lyh
view liboctave/array/chNDArray.h @ 16169:0303fda3e929
Fix range behavior with -0 endpoints (bug #38423)
* libinterp/interpfcn/pr-output.cc(octave_print_internal): print base
or limit of range rather than using expression base+i*increment
which can destroy the signbit of base/limit.
* liboctave/array/Range.cc(Range constructor): Move trivial 2-line constructor
to .h file.
* liboctave/array/Range.cc(matrix_value, checkelem): Return base for first
element of array. Return limit of range for end of array if appropriate.
* liboctave/array/Range.cc(elem): Move function from Range.h Return base for
first element of array. Return limit of range for end of array if appropriate.
* liboctave/array/Range.cc(_rangeindex_helper, index): Return base for first
element of array. Return limit of range for end of array if appropriate.
* liboctave/array/Range.cc(min, max): Use '<=' or '>=' tests to
return base or limit if appropriate.
* liboctave/array/Range.cc(is_sorted): Place more common test first in
if/else if/else tree.
* liboctave/array/Range.cc(operator <<): Return base for first
element of array. Return limit of range for end of array if appropriate.
liboctave/array/Range.h(Range constructor): Put trivial 2-line constructor
in .h file.
liboctave/array/Range.h(elem): Move function which has become more complicated
to Range.cc.
* test/range.tst: Add %!tests for corner cases of base and limit of range.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 01 Mar 2013 14:06:02 -0800 |
parents | 648dabbb4c6b |
children | 7ce21619a4b9 |
line wrap: on
line source
/* Copyright (C) 2003-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/>. */ #if !defined (octave_charNDArray_h) #define octave_charNDArray_h 1 #include "Array.h" #include "chMatrix.h" #include "mx-defs.h" #include "mx-op-decl.h" #include "bsxfun-decl.h" class OCTAVE_API charNDArray : public Array<char> { public: typedef charMatrix matrix_type; charNDArray (void) : Array<char> () { } charNDArray (const dim_vector& dv) : Array<char> (dv) { } charNDArray (const dim_vector& dv, char val) : Array<char> (dv, val) { } charNDArray (const charNDArray& a) : Array<char> (a) { } charNDArray (const charMatrix& a) : Array<char> (a) { } charNDArray (char c) : Array<char> (charMatrix (c)) { } charNDArray (const char *s) : Array<char> (charMatrix (s)) { } charNDArray (const std::string& s) : Array<char> (charMatrix (s)) { } charNDArray (const string_vector& s) : Array<char> (charMatrix (s)) { } charNDArray (const Array<char>& a) : Array<char> (a) { } charNDArray& operator = (const charNDArray& a) { Array<char>::operator = (a); return *this; } bool any_element_is_nan (void) const { return false; } // FIXME -- this is not quite the right thing. boolNDArray all (int dim = -1) const; boolNDArray any (int dim = -1) const; charNDArray concat (const charNDArray& rb, const Array<octave_idx_type>& ra_idx); charNDArray concat (const NDArray& rb, const Array<octave_idx_type>& ra_idx); charNDArray& insert (const charNDArray& a, octave_idx_type r, octave_idx_type c); charNDArray& insert (const charNDArray& a, const Array<octave_idx_type>& ra_idx); charMatrix matrix_value (void) const; charNDArray squeeze (void) const { return Array<char>::squeeze (); } static void increment_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions, int start_dimension = 0); static octave_idx_type compute_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions); // i/o // friend std::ostream& operator << (std::ostream& os, const charNDArray& a); // friend std::istream& operator >> (std::istream& is, charNDArray& a); charNDArray diag (octave_idx_type k = 0) const; charNDArray diag (octave_idx_type m, octave_idx_type n) const; }; NDS_CMP_OP_DECLS (charNDArray, char, OCTAVE_API) NDS_BOOL_OP_DECLS (charNDArray, char, OCTAVE_API) SND_CMP_OP_DECLS (char, charNDArray, OCTAVE_API) SND_BOOL_OP_DECLS (char, charNDArray, OCTAVE_API) NDND_CMP_OP_DECLS (charNDArray, charNDArray, OCTAVE_API) NDND_BOOL_OP_DECLS (charNDArray, charNDArray, OCTAVE_API) BSXFUN_STDREL_DECLS (charNDArray, OCTAVE_API) #endif