Mercurial > octave-nkf
view libinterp/octave-value/ov-re-diag.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 | 4197fc428c7d |
children | f90c8372b7ba |
line wrap: on
line source
/* Copyright (C) 2008-2015 Jaroslav Hajek 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 "byte-swap.h" #include "ov-re-diag.h" #include "ov-flt-re-diag.h" #include "ov-base-diag.cc" #include "ov-scalar.h" #include "ov-re-mat.h" #include "ls-utils.h" template class octave_base_diag<DiagMatrix, Matrix>; DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_diag_matrix, "diagonal matrix", "double"); static octave_base_value * default_numeric_conversion_function (const octave_base_value& a) { CAST_CONV_ARG (const octave_diag_matrix&); return new octave_matrix (v.matrix_value ()); } octave_base_value::type_conv_info octave_diag_matrix::numeric_conversion_function (void) const { return octave_base_value::type_conv_info (default_numeric_conversion_function, octave_matrix::static_type_id ()); } static octave_base_value * default_numeric_demotion_function (const octave_base_value& a) { CAST_CONV_ARG (const octave_diag_matrix&); return new octave_float_diag_matrix (v.float_diag_matrix_value ()); } octave_base_value::type_conv_info octave_diag_matrix::numeric_demotion_function (void) const { return octave_base_value::type_conv_info (default_numeric_demotion_function, octave_float_diag_matrix::static_type_id ()); } octave_base_value * octave_diag_matrix::try_narrowing_conversion (void) { octave_base_value *retval = 0; if (matrix.nelem () == 1) retval = new octave_scalar (matrix (0, 0)); return retval; } octave_value octave_diag_matrix::do_index_op (const octave_value_list& idx, bool resize_ok) { octave_value retval; // This hack is to allow constructing permutation matrices using // eye(n)(p,:), eye(n)(:,q) && eye(n)(p,q) where p & q are permutation // vectors. if (! resize_ok && idx.length () == 2 && matrix.is_multiple_of_identity (1)) { int k = 0; // index we're accesing when index_vector throws try { idx_vector idx0 = idx(0).index_vector (); k = 1; idx_vector idx1 = idx(1).index_vector (); if (! error_state) { bool left = idx0.is_permutation (matrix.rows ()); bool right = idx1.is_permutation (matrix.cols ()); if (left && right) { if (idx0.is_colon ()) left = false; if (idx1.is_colon ()) right = false; if (left && right) retval = PermMatrix (idx0, false) * PermMatrix (idx1, true); else if (left) retval = PermMatrix (idx0, false); else if (right) retval = PermMatrix (idx1, true); else { retval = this; this->count++; } } } } catch (index_exception& e) { // Rethrow to allow more info to be reported later. e.set_pos_if_unset (2, k+1); throw; } } // if error_state is set, we've already griped. if (! error_state && retval.is_undefined ()) retval = octave_base_diag<DiagMatrix, Matrix>::do_index_op (idx, resize_ok); return retval; } DiagMatrix octave_diag_matrix::diag_matrix_value (bool) const { return matrix; } FloatDiagMatrix octave_diag_matrix::float_diag_matrix_value (bool) const { return FloatDiagMatrix (matrix); } ComplexDiagMatrix octave_diag_matrix::complex_diag_matrix_value (bool) const { return ComplexDiagMatrix (matrix); } FloatComplexDiagMatrix octave_diag_matrix::float_complex_diag_matrix_value (bool) const { return FloatComplexDiagMatrix (matrix); } octave_value octave_diag_matrix::map (unary_mapper_t umap) const { switch (umap) { case umap_abs: return matrix.abs (); case umap_real: case umap_conj: return matrix; case umap_imag: return DiagMatrix (matrix.rows (), matrix.cols (), 0.0); case umap_sqrt: { ComplexColumnVector tmp = matrix.extract_diag ().map<Complex> (rc_sqrt); ComplexDiagMatrix retval (tmp); retval.resize (matrix.rows (), matrix.columns ()); return retval; } default: return to_dense ().map (umap); } } bool octave_diag_matrix::save_binary (std::ostream& os, bool& save_as_floats) { int32_t r = matrix.rows (); int32_t c = matrix.cols (); os.write (reinterpret_cast<char *> (&r), 4); os.write (reinterpret_cast<char *> (&c), 4); Matrix m = Matrix (matrix.extract_diag ()); save_type st = LS_DOUBLE; if (save_as_floats) { if (m.too_large_for_float ()) { warning ("save: some values too large to save as floats --"); warning ("save: saving as doubles instead"); } else st = LS_FLOAT; } else if (matrix.length () > 8192) // FIXME: make this configurable. { double max_val, min_val; if (m.all_integers (max_val, min_val)) st = get_save_type (max_val, min_val); } const double *mtmp = m.data (); write_doubles (os, mtmp, st, m.numel ()); return true; } bool octave_diag_matrix::load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt) { int32_t r, c; char tmp; if (! (is.read (reinterpret_cast<char *> (&r), 4) && is.read (reinterpret_cast<char *> (&c), 4) && is.read (reinterpret_cast<char *> (&tmp), 1))) return false; if (swap) { swap_bytes<4> (&r); swap_bytes<4> (&c); } DiagMatrix m (r, c); double *re = m.fortran_vec (); octave_idx_type len = m.length (); read_doubles (is, re, static_cast<save_type> (tmp), len, swap, fmt); if (error_state || ! is) return false; matrix = m; return true; } bool octave_diag_matrix::chk_valid_scalar (const octave_value& val, double& x) const { bool retval = val.is_real_scalar (); if (retval) x = val.double_value (); return retval; }