Mercurial > hg > octave-lyh
view liboctave/array/boolMatrix.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) 1996-2012 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/>. */ #if !defined (octave_boolMatrix_int_h) #define octave_boolMatrix_int_h 1 #include "Array.h" #include "mx-defs.h" #include "mx-op-decl.h" class OCTAVE_API boolMatrix : public Array<bool> { public: boolMatrix (void) : Array<bool> () { } boolMatrix (octave_idx_type r, octave_idx_type c) : Array<bool> (dim_vector (r, c)) { } boolMatrix (octave_idx_type r, octave_idx_type c, bool val) : Array<bool> (dim_vector (r, c), val) { } boolMatrix (const dim_vector& dv) : Array<bool> (dv) { } boolMatrix (const dim_vector& dv, bool val) : Array<bool> (dv, val) { } boolMatrix (const Array<bool>& a) : Array<bool> (a.as_matrix ()) { } boolMatrix (const boolMatrix& a) : Array<bool> (a) { } boolMatrix& operator = (const boolMatrix& a) { Array<bool>::operator = (a); return *this; } bool operator == (const boolMatrix& a) const; bool operator != (const boolMatrix& a) const; boolMatrix transpose (void) const { return Array<bool>::transpose (); } // destructive insert/delete/reorder operations boolMatrix& insert (const boolMatrix& a, octave_idx_type r, octave_idx_type c); // unary operations boolMatrix operator ! (void) const; // other operations boolMatrix diag (octave_idx_type k = 0) const; boolMatrix all (int dim = -1) const; boolMatrix any (int dim = -1) const; #if 0 // i/o friend std::ostream& operator << (std::ostream& os, const Matrix& a); friend std::istream& operator >> (std::istream& is, Matrix& a); #endif void resize (octave_idx_type nr, octave_idx_type nc, bool rfv = false) { Array<bool>::resize (dim_vector (nr, nc), rfv); } }; MM_BOOL_OP_DECLS (boolMatrix, boolMatrix, OCTAVE_API) MS_BOOL_OP_DECLS (boolMatrix, bool, OCTAVE_API) SM_BOOL_OP_DECLS (bool, boolMatrix, OCTAVE_API) MM_CMP_OP_DECLS (boolMatrix, boolMatrix, OCTAVE_API) #endif