Mercurial > octave-nkf
view liboctave/array/fNDArray.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
/* Copyright (C) 1996-2015 John W. Eaton 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_fNDArray_h) #define octave_fNDArray_h 1 #include "MArray.h" #include "intNDArray.h" #include "mx-defs.h" #include "mx-op-decl.h" #include "bsxfun-decl.h" class OCTAVE_API FloatNDArray : public MArray<float> { public: FloatNDArray (void) : MArray<float> () { } FloatNDArray (const dim_vector& dv) : MArray<float> (dv) { } FloatNDArray (const dim_vector& dv, float val) : MArray<float> (dv, val) { } FloatNDArray (const FloatNDArray& a) : MArray<float> (a) { } template <class U> FloatNDArray (const MArray<U>& a) : MArray<float> (a) { } template <class U> FloatNDArray (const Array<U>& a) : MArray<float> (a) { } template <class U> explicit FloatNDArray (const intNDArray<U>& a) : MArray<float> (a) { } FloatNDArray (const charNDArray&); FloatNDArray& operator = (const FloatNDArray& a) { MArray<float>::operator = (a); return *this; } // unary operations boolNDArray operator ! (void) const; bool any_element_is_negative (bool = false) const; bool any_element_is_positive (bool = false) const; bool any_element_is_nan (void) const; bool any_element_is_inf_or_nan (void) const; bool any_element_not_one_or_zero (void) const; bool all_elements_are_zero (void) const; bool all_elements_are_int_or_inf_or_nan (void) const; bool all_integers (float& max_val, float& min_val) const; bool all_integers (void) const; bool too_large_for_float (void) const; // FIXME: this is not quite the right thing. boolNDArray all (int dim = -1) const; boolNDArray any (int dim = -1) const; FloatNDArray cumprod (int dim = -1) const; FloatNDArray cumsum (int dim = -1) const; FloatNDArray prod (int dim = -1) const; NDArray dprod (int dim = -1) const; FloatNDArray sum (int dim = -1) const; NDArray dsum (int dim = -1) const; FloatNDArray sumsq (int dim = -1) const; FloatNDArray concat (const FloatNDArray& rb, const Array<octave_idx_type>& ra_idx); FloatComplexNDArray concat (const FloatComplexNDArray& rb, const Array<octave_idx_type>& ra_idx); charNDArray concat (const charNDArray& rb, const Array<octave_idx_type>& ra_idx); FloatNDArray max (int dim = -1) const; FloatNDArray max (Array<octave_idx_type>& index, int dim = -1) const; FloatNDArray min (int dim = -1) const; FloatNDArray min (Array<octave_idx_type>& index, int dim = -1) const; FloatNDArray cummax (int dim = -1) const; FloatNDArray cummax (Array<octave_idx_type>& index, int dim = -1) const; FloatNDArray cummin (int dim = -1) const; FloatNDArray cummin (Array<octave_idx_type>& index, int dim = -1) const; FloatNDArray diff (octave_idx_type order = 1, int dim = -1) const; FloatNDArray& insert (const FloatNDArray& a, octave_idx_type r, octave_idx_type c); FloatNDArray& insert (const FloatNDArray& a, const Array<octave_idx_type>& ra_idx); FloatNDArray abs (void) const; boolNDArray isnan (void) const; boolNDArray isinf (void) const; boolNDArray isfinite (void) const; FloatComplexNDArray fourier (int dim = 1) const; FloatComplexNDArray ifourier (int dim = 1) const; FloatComplexNDArray fourier2d (void) const; FloatComplexNDArray ifourier2d (void) const; FloatComplexNDArray fourierNd (void) const; FloatComplexNDArray ifourierNd (void) const; friend OCTAVE_API FloatNDArray real (const FloatComplexNDArray& a); friend OCTAVE_API FloatNDArray imag (const FloatComplexNDArray& a); friend class FloatComplexNDArray; FloatNDArray squeeze (void) const { return MArray<float>::squeeze (); } static void increment_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions, int start_dimension = 0); static octave_idx_type compute_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions); // i/o friend OCTAVE_API std::ostream& operator << (std::ostream& os, const FloatNDArray& a); friend OCTAVE_API std::istream& operator >> (std::istream& is, FloatNDArray& a); FloatNDArray diag (octave_idx_type k = 0) const; FloatNDArray diag (octave_idx_type m, octave_idx_type n) const; FloatNDArray& changesign (void) { MArray<float>::changesign (); return *this; } }; // Publish externally used friend functions. extern OCTAVE_API FloatNDArray real (const FloatComplexNDArray& a); extern OCTAVE_API FloatNDArray imag (const FloatComplexNDArray& a); MINMAX_DECLS (FloatNDArray, float, OCTAVE_API) NDS_CMP_OP_DECLS (FloatNDArray, float, OCTAVE_API) NDS_BOOL_OP_DECLS (FloatNDArray, float, OCTAVE_API) SND_CMP_OP_DECLS (float, FloatNDArray, OCTAVE_API) SND_BOOL_OP_DECLS (float, FloatNDArray, OCTAVE_API) NDND_CMP_OP_DECLS (FloatNDArray, FloatNDArray, OCTAVE_API) NDND_BOOL_OP_DECLS (FloatNDArray, FloatNDArray, OCTAVE_API) MARRAY_FORWARD_DEFS (MArray, FloatNDArray, float) BSXFUN_STDOP_DECLS (FloatNDArray, OCTAVE_API) BSXFUN_STDREL_DECLS (FloatNDArray, OCTAVE_API) BSXFUN_OP_DECL (pow, FloatNDArray, OCTAVE_API) BSXFUN_OP2_DECL (pow, FloatComplexNDArray, FloatComplexNDArray, FloatNDArray, OCTAVE_API) BSXFUN_OP2_DECL (pow, FloatComplexNDArray, FloatNDArray, FloatComplexNDArray, OCTAVE_API) #endif