Mercurial > octave-nkf
view liboctave/array/intNDArray.cc @ 20574:dd6345fd8a97
use exceptions for better invalid index error reporting (bug #45957)
* lo-array-gripes.h, lo-array-gripes.cc (index_exception):
New base class for indexing errors.
(invalid_index, out_of_range): New classes.
(gripe_index_out_of_range): New overloaded function.
(gripe_invalid_index): New overloaded functions.
Delete version with no arguments.
(gripe_invalid_assignment_size, gripe_assignment_dimension_mismatch):
Delete.
Change uses of gripe functions as needed.
* Cell.cc (Cell::index, Cell::assign, Cell::delete_elements): Use
exceptions to collect error info about and handle indexing errors.
* data.cc (Fnth_element, do_accumarray_sum, F__accumarray_sum__,
do_accumarray_minmax, do_accumarray_minmax_fun, F__accumdim_sum__):
Likewise.
* oct-map.cc (octave_map::index, octave_map::assign,
octave_map::delete_elements): Likewise.
* sparse.cc (Fsparse): Likewise.
* sub2ind.cc (Fsub2ind, Find2sub): Likewise. New tests.
* utils.cc (dims_to_numel): Likewise.
* ov-base-diag.cc (octave_base_diag<DMT, MT>::do_index_op,
octave_base_diag<DMT, MT>::subsasgn): Likewise.
* ov-base-mat.cc (octave_base_matrix<MT>::subsref,
octave_base_matrix<MT>::assign): Likewise.
* ov-base-sparse.cc (octave_base_sparse<T>::do_index_op,
octave_base_sparse<T>::assign,
octave_base_sparse<MT>::delete_elements): Likewise.
* ov-classdef.cc (cdef_object_array::subsref,
cdef_object_array::subsasgn): Likewise.
* ov-java.cc (make_java_index): Likewise.
* ov-perm.cc (octave_perm_matrix::do_index_op): Likewise.
* ov-range.cc (octave_range::do_index_op): Likewise.
* ov-re-diag.cc (octave_diag_matrix::do_index_op): Likewise.
* ov-str-mat.cc (octave_char_matrix_str::do_index_op_internal): Likewise.
* pt-assign.cc (tree_simple_assignment::rvalue1): Likewise.
* pt-idx.cc (tree_index_expression::rvalue,
tree_index_expression::lvalue): Likewise.
* Array-util.cc (sub2ind): Likewise.
* toplev.cc (main_loop): Also catch unhandled index_exception
exceptions.
* ov-base.cc (octave_base_value::index_vector): Improve error message.
* ov-re-sparse.cc (octave_sparse_matrix::index_vector): Likewise.
* ov-complex.cc (complex_index): New class.
(gripe_complex_index): New function.
(octave_complex::index_vector): Use it.
* pt-id.h, pt-id.cc (tree_identifier::is_variable,
tree_black_hole::is_variable): Now const.
* pt-idx.cc (final_index_error): New static function.
(tree_index_expression::rvalue, tree_index_expression::lvalue):
Use it.
* index.tst: New tests.
author | Lachlan Andrew <lachlanbis@gmail.com> |
---|---|
date | Fri, 02 Oct 2015 15:07:37 -0400 |
parents | a9574e3c6e9e |
children |
line wrap: on
line source
// N-D Array manipulations. /* Copyright (C) 2004-2015 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 "mx-base.h" #include "lo-ieee.h" #include "mx-inlines.cc" // unary operations template <class T> boolNDArray intNDArray<T>::operator ! (void) const { boolNDArray b (this->dims ()); for (octave_idx_type i = 0; i < this->numel (); i++) b.elem (i) = ! this->elem (i); return b; } template <class T> bool intNDArray<T>::any_element_not_one_or_zero (void) const { octave_idx_type nel = this->numel (); for (octave_idx_type i = 0; i < nel; i++) { T val = this->elem (i); if (val != 0.0 && val != 1.0) return true; } return false; } template <class T> intNDArray<T> intNDArray<T>::diag (octave_idx_type k) const { return MArray<T>::diag (k); } template <class T> intNDArray<T> intNDArray<T>::diag (octave_idx_type m, octave_idx_type n) const { return MArray<T>::diag (m, n); } // FIXME: this is not quite the right thing. template <class T> boolNDArray intNDArray<T>::all (int dim) const { return do_mx_red_op<bool, T > (*this, dim, mx_inline_all); } template <class T> boolNDArray intNDArray<T>::any (int dim) const { return do_mx_red_op<bool, T > (*this, dim, mx_inline_any); } template <class T> void intNDArray<T>::increment_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions, int start_dimension) { ::increment_index (ra_idx, dimensions, start_dimension); } template <class T> octave_idx_type intNDArray<T>::compute_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions) { return ::compute_index (ra_idx, dimensions); } template <class T> intNDArray<T> intNDArray<T>::concat (const intNDArray<T>& rb, const Array<octave_idx_type>& ra_idx) { if (rb.numel () > 0) insert (rb, ra_idx); return *this; } template <class T> intNDArray<T>& intNDArray<T>::insert (const intNDArray<T>& a, octave_idx_type r, octave_idx_type c) { Array<T>::insert (a, r, c); return *this; } template <class T> intNDArray<T>& intNDArray<T>::insert (const intNDArray<T>& a, const Array<octave_idx_type>& ra_idx) { Array<T>::insert (a, ra_idx); return *this; } // This contains no information on the array structure !!! template <class T> std::ostream& operator << (std::ostream& os, const intNDArray<T>& a) { octave_idx_type nel = a.numel (); for (octave_idx_type i = 0; i < nel; i++) os << " " << a.elem (i) << "\n"; return os; } template <class T> std::istream& operator >> (std::istream& is, intNDArray<T>& a) { octave_idx_type nel = a.numel (); if (nel > 0) { T tmp; for (octave_idx_type i = 0; i < nel; i++) { is >> tmp; if (is) a.elem (i) = tmp; else goto done; } } done: return is; } // FIXME: should abs and signum just be mapper functions? template <class T> intNDArray<T> intNDArray<T>::abs (void) const { octave_idx_type nel = this->numel (); intNDArray<T> ret (this->dims ()); for (octave_idx_type i = 0; i < nel; i++) { T val = this->elem (i); ret.xelem (i) = val.abs (); } return ret; } template <class T> intNDArray<T> intNDArray<T>::signum (void) const { octave_idx_type nel = this->numel (); intNDArray<T> ret (this->dims ()); for (octave_idx_type i = 0; i < nel; i++) { T val = this->elem (i); ret.xelem (i) = val.signum (); } return ret; } template <class T> intNDArray<T> intNDArray<T>::prod (int dim) const { return do_mx_red_op<T, T> (*this, dim, mx_inline_prod); } template <class T> intNDArray<T> intNDArray<T>::sum (int dim) const { return do_mx_red_op<T, T> (*this, dim, mx_inline_sum); } template <class T> NDArray intNDArray<T>::dsum (int dim) const { return do_mx_red_op<double, T> (*this, dim, mx_inline_dsum); } template <class T> intNDArray<T> intNDArray<T>::cumsum (int dim) const { return do_mx_cum_op<T, T> (*this, dim, mx_inline_cumsum); } template <class T> intNDArray<T> intNDArray<T>::max (int dim) const { return do_mx_minmax_op<T> (*this, dim, mx_inline_max); } template <class T> intNDArray<T> intNDArray<T>::max (Array<octave_idx_type>& idx_arg, int dim) const { return do_mx_minmax_op<T> (*this, idx_arg, dim, mx_inline_max); } template <class T> intNDArray<T> intNDArray<T>::min (int dim) const { return do_mx_minmax_op<T> (*this, dim, mx_inline_min); } template <class T> intNDArray<T> intNDArray<T>::min (Array<octave_idx_type>& idx_arg, int dim) const { return do_mx_minmax_op<T> (*this, idx_arg, dim, mx_inline_min); } template <class T> intNDArray<T> intNDArray<T>::cummax (int dim) const { return do_mx_cumminmax_op<T> (*this, dim, mx_inline_cummax); } template <class T> intNDArray<T> intNDArray<T>::cummax (Array<octave_idx_type>& idx_arg, int dim) const { return do_mx_cumminmax_op<T> (*this, idx_arg, dim, mx_inline_cummax); } template <class T> intNDArray<T> intNDArray<T>::cummin (int dim) const { return do_mx_cumminmax_op<T> (*this, dim, mx_inline_cummin); } template <class T> intNDArray<T> intNDArray<T>::cummin (Array<octave_idx_type>& idx_arg, int dim) const { return do_mx_cumminmax_op<T> (*this, idx_arg, dim, mx_inline_cummin); } template <class T> intNDArray<T> intNDArray<T>::diff (octave_idx_type order, int dim) const { return do_mx_diff_op<T> (*this, dim, order, mx_inline_diff); }