Mercurial > hg > octave-lyh
view liboctave/array/boolNDArray.cc @ 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
// N-D Array manipulations. /* Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. 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 "Array-util.h" #include "CNDArray.h" #include "mx-base.h" #include "lo-ieee.h" #include "mx-op-defs.h" #include "MArray-defs.h" #include "bsxfun-defs.cc" // unary operations boolNDArray boolNDArray::operator ! (void) const { return do_mx_unary_op<bool, bool> (*this, mx_inline_not); } boolNDArray& boolNDArray::invert (void) { if (is_shared ()) *this = ! *this; else do_mx_inplace_op<bool> (*this, mx_inline_not2); return *this; } // FIXME -- this is not quite the right thing. boolNDArray boolNDArray::all (int dim) const { return do_mx_red_op<bool, bool> (*this, dim, mx_inline_all); } boolNDArray boolNDArray::any (int dim) const { return do_mx_red_op<bool, bool> (*this, dim, mx_inline_any); } NDArray boolNDArray::sum (int dim) const { // NOTE: going via octave_idx_type is typically faster even though it // requires a conversion. return do_mx_red_op<octave_idx_type, bool> (*this, dim, mx_inline_count); } NDArray boolNDArray::cumsum (int dim) const { // In this case, it's better to sum directly to doubles. return do_mx_cum_op<double , bool> (*this, dim, mx_inline_cumcount); } boolNDArray boolNDArray::concat (const boolNDArray& rb, const Array<octave_idx_type>& ra_idx) { if (rb.numel () > 0) insert (rb, ra_idx); return *this; } boolNDArray& boolNDArray::insert (const boolNDArray& a, octave_idx_type r, octave_idx_type c) { Array<bool>::insert (a, r, c); return *this; } boolNDArray& boolNDArray::insert (const boolNDArray& a, const Array<octave_idx_type>& ra_idx) { Array<bool>::insert (a, ra_idx); return *this; } boolMatrix boolNDArray::matrix_value (void) const { return *this; } void boolNDArray::increment_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions, int start_dimension) { ::increment_index (ra_idx, dimensions, start_dimension); } octave_idx_type boolNDArray::compute_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions) { return ::compute_index (ra_idx, dimensions); } boolNDArray boolNDArray::diag (octave_idx_type k) const { return Array<bool>::diag (k); } boolNDArray boolNDArray::diag (octave_idx_type m, octave_idx_type n) const { return Array<bool>::diag (m, n); } NDND_BOOL_OPS (boolNDArray, boolNDArray) NDND_CMP_OPS (boolNDArray, boolNDArray) NDS_BOOL_OPS (boolNDArray, bool) NDS_CMP_OPS (boolNDArray, bool) SND_BOOL_OPS (bool, boolNDArray) SND_CMP_OPS (bool, boolNDArray) boolNDArray& mx_el_and_assign (boolNDArray& a, const boolNDArray& b) { if (a.is_shared ()) a = mx_el_and (a, b); else do_mm_inplace_op<bool, bool> (a, b, mx_inline_and2, mx_inline_and2, "operator &="); return a; } boolNDArray& mx_el_or_assign (boolNDArray& a, const boolNDArray& b) { if (a.is_shared ()) a = mx_el_or (a, b); else do_mm_inplace_op<bool, bool> (a, b, mx_inline_or2, mx_inline_or2, "operator |="); return a; } BSXFUN_OP_DEF_MXLOOP (and, boolNDArray, mx_inline_and) BSXFUN_OP_DEF_MXLOOP (or, boolNDArray, mx_inline_or)