Mercurial > hg > octave-lyh
view liboctave/array/boolNDArray.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 |
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_boolNDArray_h) #define octave_boolNDArray_h 1 #include "Array.h" #include "mx-defs.h" #include "mx-op-decl.h" #include "bsxfun-decl.h" #include "boolMatrix.h" class OCTAVE_API boolNDArray : public Array<bool> { public: typedef boolMatrix matrix_type; boolNDArray (void) : Array<bool> () { } boolNDArray (const dim_vector& dv) : Array<bool> (dv) { } boolNDArray (const dim_vector& dv, const bool& val) : Array<bool> (dv, val) { } boolNDArray (const boolNDArray& a) : Array<bool> (a) { } boolNDArray (const boolMatrix& a) : Array<bool> (a) { } boolNDArray (const Array<bool>& a) : Array<bool> (a) { } boolNDArray& operator = (const boolNDArray& a) { Array<bool>::operator = (a); return *this; } // unary operations boolNDArray operator ! (void) const; boolNDArray& invert (void); 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; NDArray sum (int dim = -1) const; NDArray cumsum (int dim = -1) const; boolNDArray concat (const boolNDArray& rb, const Array<octave_idx_type>& ra_idx); boolNDArray& insert (const boolNDArray& a, octave_idx_type r, octave_idx_type c); boolNDArray& insert (const boolNDArray& a, const Array<octave_idx_type>& ra_idx); boolMatrix matrix_value (void) const; boolNDArray squeeze (void) const { return Array<bool>::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 NDArray& a); // friend std::istream& operator >> (std::istream& is, NDArray& a); // bool all_elements_are_real (void) const; // bool all_integers (double& max_val, double& min_val) const; boolNDArray diag (octave_idx_type k = 0) const; boolNDArray diag (octave_idx_type m, octave_idx_type n) const; }; NDND_BOOL_OP_DECLS (boolNDArray, boolNDArray, OCTAVE_API) NDND_CMP_OP_DECLS (boolNDArray, boolNDArray, OCTAVE_API) NDS_BOOL_OP_DECLS (boolNDArray, bool, OCTAVE_API) NDS_CMP_OP_DECLS (boolNDArray, bool, OCTAVE_API) SND_BOOL_OP_DECLS (bool, boolNDArray, OCTAVE_API) SND_CMP_OP_DECLS (bool, boolNDArray, OCTAVE_API) extern OCTAVE_API boolNDArray& mx_el_and_assign (boolNDArray& m, const boolNDArray& a); extern OCTAVE_API boolNDArray& mx_el_or_assign (boolNDArray& m, const boolNDArray& a); BSXFUN_OP_DECL (and, boolNDArray, OCTAVE_API); BSXFUN_OP_DECL (or, boolNDArray, OCTAVE_API); #endif