Mercurial > octave-nkf
view liboctave/array/MDiagArray2.h @ 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 | 4197fc428c7d |
children |
line wrap: on
line source
// Template array classes with like-type math ops /* Copyright (C) 1996-2015 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_MDiagArray2_h) #define octave_MDiagArray2_h 1 #include "DiagArray2.h" #include "MArray.h" // Two dimensional diagonal array with math ops. // But first, some preprocessor abuse... #include "MArray-decl.h" MDIAGARRAY2_OPS_FORWARD_DECLS (MDiagArray2, ) template <class T> class MDiagArray2 : public DiagArray2<T> { public: MDiagArray2 (void) : DiagArray2<T> () { } MDiagArray2 (octave_idx_type r, octave_idx_type c) : DiagArray2<T> (r, c) { } MDiagArray2 (octave_idx_type r, octave_idx_type c, const T& val) : DiagArray2<T> (r, c, val) { } MDiagArray2 (const MDiagArray2<T>& a) : DiagArray2<T> (a) { } MDiagArray2 (const DiagArray2<T>& a) : DiagArray2<T> (a) { } template <class U> MDiagArray2 (const DiagArray2<U>& a) : DiagArray2<T> (a) { } explicit MDiagArray2 (const Array<T>& a) : DiagArray2<T> (a) { } MDiagArray2 (const Array<T>& a, octave_idx_type r, octave_idx_type c) : DiagArray2<T> (a, r, c) { } ~MDiagArray2 (void) { } MDiagArray2<T>& operator = (const MDiagArray2<T>& a) { DiagArray2<T>::operator = (a); return *this; } MArray<T> array_value () const { return DiagArray2<T>::array_value (); } octave_idx_type nnz (void) const { octave_idx_type retval = 0; const T *d = this->data (); octave_idx_type nel = this->length (); for (octave_idx_type i = 0; i < nel; i++) { if (d[i] != T ()) retval++; } return retval; } MArray<T> diag (octave_idx_type k = 0) const { return DiagArray2<T>::extract_diag (k); } MDiagArray2<T> transpose (void) const { return DiagArray2<T>::transpose (); } MDiagArray2<T> hermitian (T (*fcn) (const T&) = 0) const { return DiagArray2<T>::hermitian (fcn); } bool is_multiple_of_identity (T val) const; // Currently, the OPS functions don't need to be friends, but that // may change. MDIAGARRAY2_OPS_FRIEND_DECLS (MDiagArray2, ) }; #endif