Mercurial > octave-nkf
view liboctave/array/fColVector.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
// ColumnVector manipulations. /* Copyright (C) 1994-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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <iostream> #include "Array-util.h" #include "f77-fcn.h" #include "functor.h" #include "lo-error.h" #include "mx-base.h" #include "mx-inlines.cc" #include "oct-cmplx.h" // Fortran functions we call. extern "C" { F77_RET_T F77_FUNC (sgemv, SGEMV) (F77_CONST_CHAR_ARG_DECL, const octave_idx_type&, const octave_idx_type&, const float&, const float*, const octave_idx_type&, const float*, const octave_idx_type&, const float&, float*, const octave_idx_type& F77_CHAR_ARG_LEN_DECL); } // Column Vector class. bool FloatColumnVector::operator == (const FloatColumnVector& a) const { octave_idx_type len = numel (); if (len != a.numel ()) return 0; return mx_inline_equal (len, data (), a.data ()); } bool FloatColumnVector::operator != (const FloatColumnVector& a) const { return !(*this == a); } FloatColumnVector& FloatColumnVector::insert (const FloatColumnVector& a, octave_idx_type r) { octave_idx_type a_len = a.numel (); if (r < 0 || r + a_len > numel ()) { (*current_liboctave_error_handler) ("range error for insert"); return *this; } if (a_len > 0) { make_unique (); for (octave_idx_type i = 0; i < a_len; i++) xelem (r+i) = a.elem (i); } return *this; } FloatColumnVector& FloatColumnVector::fill (float val) { octave_idx_type len = numel (); if (len > 0) { make_unique (); for (octave_idx_type i = 0; i < len; i++) xelem (i) = val; } return *this; } FloatColumnVector& FloatColumnVector::fill (float val, octave_idx_type r1, octave_idx_type r2) { octave_idx_type len = numel (); if (r1 < 0 || r2 < 0 || r1 >= len || r2 >= len) { (*current_liboctave_error_handler) ("range error for fill"); return *this; } if (r1 > r2) { std::swap (r1, r2); } if (r2 >= r1) { make_unique (); for (octave_idx_type i = r1; i <= r2; i++) xelem (i) = val; } return *this; } FloatColumnVector FloatColumnVector::stack (const FloatColumnVector& a) const { octave_idx_type len = numel (); octave_idx_type nr_insert = len; FloatColumnVector retval (len + a.numel ()); retval.insert (*this, 0); retval.insert (a, nr_insert); return retval; } FloatRowVector FloatColumnVector::transpose (void) const { return MArray<float>::transpose (); } FloatColumnVector FloatColumnVector::abs (void) const { return do_mx_unary_map<float, float, std::abs> (*this); } FloatColumnVector real (const FloatComplexColumnVector& a) { return do_mx_unary_op<float, FloatComplex> (a, mx_inline_real); } FloatColumnVector imag (const FloatComplexColumnVector& a) { return do_mx_unary_op<float, FloatComplex> (a, mx_inline_imag); } // resize is the destructive equivalent for this one FloatColumnVector FloatColumnVector::extract (octave_idx_type r1, octave_idx_type r2) const { if (r1 > r2) { std::swap (r1, r2); } octave_idx_type new_r = r2 - r1 + 1; FloatColumnVector result (new_r); for (octave_idx_type i = 0; i < new_r; i++) result.xelem (i) = elem (r1+i); return result; } FloatColumnVector FloatColumnVector::extract_n (octave_idx_type r1, octave_idx_type n) const { FloatColumnVector result (n); for (octave_idx_type i = 0; i < n; i++) result.xelem (i) = elem (r1+i); return result; } // matrix by column vector -> column vector operations FloatColumnVector operator * (const FloatMatrix& m, const FloatColumnVector& a) { FloatColumnVector retval; octave_idx_type nr = m.rows (); octave_idx_type nc = m.cols (); octave_idx_type a_len = a.numel (); if (nc != a_len) gripe_nonconformant ("operator *", nr, nc, a_len, 1); else { retval.clear (nr); if (nr != 0) { if (nc == 0) retval.fill (0.0); else { float *y = retval.fortran_vec (); F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 ("N", 1), nr, nc, 1.0f, m.data (), nr, a.data (), 1, 0.0f, y, 1 F77_CHAR_ARG_LEN (1))); } } } return retval; } // diagonal matrix by column vector -> column vector operations FloatColumnVector operator * (const FloatDiagMatrix& m, const FloatColumnVector& a) { FloatColumnVector retval; octave_idx_type nr = m.rows (); octave_idx_type nc = m.cols (); octave_idx_type a_len = a.numel (); if (nc != a_len) gripe_nonconformant ("operator *", nr, nc, a_len, 1); else { if (nr == 0 || nc == 0) retval.resize (nr, 0.0); else { retval.resize (nr); for (octave_idx_type i = 0; i < a_len; i++) retval.elem (i) = a.elem (i) * m.elem (i, i); for (octave_idx_type i = a_len; i < nr; i++) retval.elem (i) = 0.0; } } return retval; } // other operations float FloatColumnVector::min (void) const { octave_idx_type len = numel (); if (len == 0) return 0.0; float res = elem (0); for (octave_idx_type i = 1; i < len; i++) if (elem (i) < res) res = elem (i); return res; } float FloatColumnVector::max (void) const { octave_idx_type len = numel (); if (len == 0) return 0.0; float res = elem (0); for (octave_idx_type i = 1; i < len; i++) if (elem (i) > res) res = elem (i); return res; } std::ostream& operator << (std::ostream& os, const FloatColumnVector& a) { // int field_width = os.precision () + 7; for (octave_idx_type i = 0; i < a.numel (); i++) os << /* setw (field_width) << */ a.elem (i) << "\n"; return os; } std::istream& operator >> (std::istream& is, FloatColumnVector& a) { octave_idx_type len = a.numel (); if (len > 0) { float tmp; for (octave_idx_type i = 0; i < len; i++) { is >> tmp; if (is) a.elem (i) = tmp; else break; } } return is; }