Mercurial > octave-nkf
comparison liboctave/array/Sparse.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 |
comparison
equal
deleted
inserted
replaced
| 20573:e3c0fee87493 | 20574:dd6345fd8a97 |
|---|---|
| 1429 Sparse<T> tmp = *this; | 1429 Sparse<T> tmp = *this; |
| 1430 tmp.resize1 (ext); | 1430 tmp.resize1 (ext); |
| 1431 retval = tmp.index (idx); | 1431 retval = tmp.index (idx); |
| 1432 } | 1432 } |
| 1433 else | 1433 else |
| 1434 gripe_index_out_of_range (1, 1, idx.extent (nel), nel); | 1434 gripe_index_out_of_range (1, 1, idx.extent (nel), nel, dims ()); |
| 1435 } | 1435 } |
| 1436 else if (nr == 1 && nc == 1) | 1436 else if (nr == 1 && nc == 1) |
| 1437 { | 1437 { |
| 1438 // You have to be pretty sick to get to this bit of code, | 1438 // You have to be pretty sick to get to this bit of code, |
| 1439 // since you have a scalar stored as a sparse matrix, and | 1439 // since you have a scalar stored as a sparse matrix, and |
| 1612 Sparse<T> tmp = *this; | 1612 Sparse<T> tmp = *this; |
| 1613 tmp.resize (ext_i, ext_j); | 1613 tmp.resize (ext_i, ext_j); |
| 1614 retval = tmp.index (idx_i, idx_j); | 1614 retval = tmp.index (idx_i, idx_j); |
| 1615 } | 1615 } |
| 1616 else if (idx_i.extent (nr) > nr) | 1616 else if (idx_i.extent (nr) > nr) |
| 1617 gripe_index_out_of_range (2, 1, idx_i.extent (nr), nr); | 1617 gripe_index_out_of_range (2, 1, idx_i.extent (nr), nr, dims ()); |
| 1618 else | 1618 else |
| 1619 gripe_index_out_of_range (2, 2, idx_j.extent (nc), nc); | 1619 gripe_index_out_of_range (2, 2, idx_j.extent (nc), nc, dims ()); |
| 1620 } | 1620 } |
| 1621 else if (nr == 1 && nc == 1) | 1621 else if (nr == 1 && nc == 1) |
| 1622 { | 1622 { |
| 1623 // Scalars stored as sparse matrices occupy more memory than | 1623 // Scalars stored as sparse matrices occupy more memory than |
| 1624 // a scalar, so let's just convert the matrix to full, index, | 1624 // a scalar, so let's just convert the matrix to full, index, |
| 1976 assign (idx, Sparse<T> (rhl, 1, rhs.data (0))); | 1976 assign (idx, Sparse<T> (rhl, 1, rhs.data (0))); |
| 1977 else | 1977 else |
| 1978 assign (idx, Sparse<T> (rhl, 1)); | 1978 assign (idx, Sparse<T> (rhl, 1)); |
| 1979 } | 1979 } |
| 1980 else | 1980 else |
| 1981 gripe_invalid_assignment_size (); | 1981 gripe_nonconformant ("=", dim_vector(idx.length (n),1), rhs.dims()); |
| 1982 } | 1982 } |
| 1983 | 1983 |
| 1984 template <class T> | 1984 template <class T> |
| 1985 void | 1985 void |
| 1986 Sparse<T>::assign (const idx_vector& idx_i, | 1986 Sparse<T>::assign (const idx_vector& idx_i, |
| 2212 assign (idx_i, idx_j, Sparse<T> (n, m, rhs.data (0))); | 2212 assign (idx_i, idx_j, Sparse<T> (n, m, rhs.data (0))); |
| 2213 else | 2213 else |
| 2214 assign (idx_i, idx_j, Sparse<T> (n, m)); | 2214 assign (idx_i, idx_j, Sparse<T> (n, m)); |
| 2215 } | 2215 } |
| 2216 else | 2216 else |
| 2217 gripe_assignment_dimension_mismatch (); | 2217 gripe_nonconformant ("=", idx_i.length (nr), idx_j.length (nc), n, m); |
| 2218 } | 2218 } |
| 2219 | 2219 |
| 2220 // Can't use versions of these in Array.cc due to duplication of the | 2220 // Can't use versions of these in Array.cc due to duplication of the |
| 2221 // instantiations for Array<double and Sparse<double>, etc | 2221 // instantiations for Array<double and Sparse<double>, etc |
| 2222 template <class T> | 2222 template <class T> |