Mercurial > octave-nkf
view liboctave/array/MArray.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
/* Copyright (C) 1993-2015 John W. Eaton Copyright (C) 2009 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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "MArray.h" #include "Array-util.h" #include "lo-error.h" #include "MArray-defs.h" #include "mx-inlines.cc" template <class T> struct _idxadds_helper { T *array; T val; _idxadds_helper (T *a, T v) : array (a), val (v) { } void operator () (octave_idx_type i) { array[i] += val; } }; template <class T> struct _idxadda_helper { T *array; const T *vals; _idxadda_helper (T *a, const T *v) : array (a), vals (v) { } void operator () (octave_idx_type i) { array[i] += *vals++; } }; template <class T> void MArray<T>::idx_add (const idx_vector& idx, T val) { octave_idx_type n = this->numel (); octave_idx_type ext = idx.extent (n); if (ext > n) { this->resize1 (ext); n = ext; } octave_quit (); octave_idx_type len = idx.length (n); idx.loop (len, _idxadds_helper<T> (this->fortran_vec (), val)); } template <class T> void MArray<T>::idx_add (const idx_vector& idx, const MArray<T>& vals) { octave_idx_type n = this->numel (); octave_idx_type ext = idx.extent (n); if (ext > n) { this->resize1 (ext); n = ext; } octave_quit (); octave_idx_type len = std::min (idx.length (n), vals.numel ()); idx.loop (len, _idxadda_helper<T> (this->fortran_vec (), vals.data ())); } template <class T, T op (typename ref_param<T>::type, typename ref_param<T>::type)> struct _idxbinop_helper { T *array; const T *vals; _idxbinop_helper (T *a, const T *v) : array (a), vals (v) { } void operator () (octave_idx_type i) { array[i] = op (array[i], *vals++); } }; template <class T> void MArray<T>::idx_min (const idx_vector& idx, const MArray<T>& vals) { octave_idx_type n = this->numel (); octave_idx_type ext = idx.extent (n); if (ext > n) { this->resize1 (ext); n = ext; } octave_quit (); octave_idx_type len = std::min (idx.length (n), vals.numel ()); idx.loop (len, _idxbinop_helper<T, xmin> (this->fortran_vec (), vals.data ())); } template <class T> void MArray<T>::idx_max (const idx_vector& idx, const MArray<T>& vals) { octave_idx_type n = this->numel (); octave_idx_type ext = idx.extent (n); if (ext > n) { this->resize1 (ext); n = ext; } octave_quit (); octave_idx_type len = std::min (idx.length (n), vals.numel ()); idx.loop (len, _idxbinop_helper<T, xmax> (this->fortran_vec (), vals.data ())); } #include <iostream> template <class T> void MArray<T>::idx_add_nd (const idx_vector& idx, const MArray<T>& vals, int dim) { int nd = std::max (this->ndims (), vals.ndims ()); if (dim < 0) dim = vals.dims ().first_non_singleton (); else if (dim > nd) nd = dim; // Check dimensions. dim_vector ddv = Array<T>::dims ().redim (nd); dim_vector sdv = vals.dims ().redim (nd); octave_idx_type ext = idx.extent (ddv(dim)); if (ext > ddv(dim)) { ddv(dim) = ext; Array<T>::resize (ddv); ext = ddv(dim); } octave_idx_type l,n,u,ns; get_extent_triplet (ddv, dim, l, n, u); ns = sdv(dim); sdv(dim) = ddv(dim) = 0; if (ddv != sdv) (*current_liboctave_error_handler) ("accumdim: dimension mismatch"); T *dst = Array<T>::fortran_vec (); const T *src = vals.data (); octave_idx_type len = idx.length (ns); if (l == 1) { for (octave_idx_type j = 0; j < u; j++) { octave_quit (); idx.loop (len, _idxadda_helper<T> (dst + j*n, src + j*ns)); } } else { for (octave_idx_type j = 0; j < u; j++) { octave_quit (); for (octave_idx_type i = 0; i < len; i++) { octave_idx_type k = idx(i); mx_inline_add2 (l, dst + l*k, src + l*i); } dst += l*n; src += l*ns; } } } // N-dimensional array with math ops. template <class T> void MArray<T>::changesign (void) { if (Array<T>::is_shared ()) *this = - *this; else do_mx_inplace_op<T> (*this, mx_inline_uminus2); } // Element by element MArray by scalar ops. template <class T> MArray<T>& operator += (MArray<T>& a, const T& s) { if (a.is_shared ()) a = a + s; else do_ms_inplace_op<T, T> (a, s, mx_inline_add2); return a; } template <class T> MArray<T>& operator -= (MArray<T>& a, const T& s) { if (a.is_shared ()) a = a - s; else do_ms_inplace_op<T, T> (a, s, mx_inline_sub2); return a; } template <class T> MArray<T>& operator *= (MArray<T>& a, const T& s) { if (a.is_shared ()) a = a * s; else do_ms_inplace_op<T, T> (a, s, mx_inline_mul2); return a; } template <class T> MArray<T>& operator /= (MArray<T>& a, const T& s) { if (a.is_shared ()) a = a / s; else do_ms_inplace_op<T, T> (a, s, mx_inline_div2); return a; } // Element by element MArray by MArray ops. template <class T> MArray<T>& operator += (MArray<T>& a, const MArray<T>& b) { if (a.is_shared ()) a = a + b; else do_mm_inplace_op<T, T> (a, b, mx_inline_add2, mx_inline_add2, "+="); return a; } template <class T> MArray<T>& operator -= (MArray<T>& a, const MArray<T>& b) { if (a.is_shared ()) a = a - b; else do_mm_inplace_op<T, T> (a, b, mx_inline_sub2, mx_inline_sub2, "-="); return a; } template <class T> MArray<T>& product_eq (MArray<T>& a, const MArray<T>& b) { if (a.is_shared ()) return a = product (a, b); else do_mm_inplace_op<T, T> (a, b, mx_inline_mul2, mx_inline_mul2, ".*="); return a; } template <class T> MArray<T>& quotient_eq (MArray<T>& a, const MArray<T>& b) { if (a.is_shared ()) return a = quotient (a, b); else do_mm_inplace_op<T, T> (a, b, mx_inline_div2, mx_inline_div2, "./="); return a; } // Element by element MArray by scalar ops. #define MARRAY_NDS_OP(OP, FN) \ template <class T> \ MArray<T> \ operator OP (const MArray<T>& a, const T& s) \ { \ return do_ms_binary_op<T, T, T> (a, s, FN); \ } MARRAY_NDS_OP (+, mx_inline_add) MARRAY_NDS_OP (-, mx_inline_sub) MARRAY_NDS_OP (*, mx_inline_mul) MARRAY_NDS_OP (/, mx_inline_div) // Element by element scalar by MArray ops. #define MARRAY_SND_OP(OP, FN) \ template <class T> \ MArray<T> \ operator OP (const T& s, const MArray<T>& a) \ { \ return do_sm_binary_op<T, T, T> (s, a, FN); \ } MARRAY_SND_OP (+, mx_inline_add) MARRAY_SND_OP (-, mx_inline_sub) MARRAY_SND_OP (*, mx_inline_mul) MARRAY_SND_OP (/, mx_inline_div) // Element by element MArray by MArray ops. #define MARRAY_NDND_OP(FCN, OP, FN) \ template <class T> \ MArray<T> \ FCN (const MArray<T>& a, const MArray<T>& b) \ { \ return do_mm_binary_op<T, T, T> (a, b, FN, FN, FN, #FCN); \ } MARRAY_NDND_OP (operator +, +, mx_inline_add) MARRAY_NDND_OP (operator -, -, mx_inline_sub) MARRAY_NDND_OP (product, *, mx_inline_mul) MARRAY_NDND_OP (quotient, /, mx_inline_div) template <class T> MArray<T> operator + (const MArray<T>& a) { return a; } template <class T> MArray<T> operator - (const MArray<T>& a) { return do_mx_unary_op<T, T> (a, mx_inline_uminus); }