Mercurial > octave-nkf
view liboctave/array/PermMatrix.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 | a9574e3c6e9e |
children |
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/>. */ #if !defined (octave_PermMatrix_h) #define octave_PermMatrix_h 1 #include "Array.h" #include "mx-defs.h" // Array<T> is inherited privately so that some methods, like index, don't // produce unexpected results. class OCTAVE_API PermMatrix : protected Array<octave_idx_type> { public: PermMatrix (void) : Array<octave_idx_type> () { } PermMatrix (octave_idx_type n); PermMatrix (const Array<octave_idx_type>& p) GCC_ATTR_DEPRECATED; PermMatrix (const Array<octave_idx_type>& p, bool colp, bool check = true); PermMatrix (const PermMatrix& m) : Array<octave_idx_type> (m) { } PermMatrix (const idx_vector& idx) GCC_ATTR_DEPRECATED; PermMatrix (const idx_vector& idx, bool colp, octave_idx_type n = 0); octave_idx_type dim1 (void) const { return Array<octave_idx_type>::numel (); } octave_idx_type dim2 (void) const { return Array<octave_idx_type>::numel (); } octave_idx_type rows (void) const { return dim1 (); } octave_idx_type cols (void) const { return dim2 (); } octave_idx_type columns (void) const { return dim2 (); } octave_idx_type perm_length (void) const { return Array<octave_idx_type>::numel (); } // FIXME: a dangerous ambiguity? octave_idx_type length (void) const { return perm_length (); } GCC_ATTR_DEPRECATED octave_idx_type nelem (void) const { return numel (); } octave_idx_type numel (void) const { return dim1 () * dim2 (); } size_t byte_size (void) const { return Array<octave_idx_type>::byte_size (); } dim_vector dims (void) const { return dim_vector (dim1 (), dim2 ()); } const Array<octave_idx_type>& col_perm_vec (void) const { return *this; } octave_idx_type elem (octave_idx_type i, octave_idx_type j) const { return (Array<octave_idx_type>::elem (j) == i) ? 1 : 0; } octave_idx_type checkelem (octave_idx_type i, octave_idx_type j) const; octave_idx_type operator () (octave_idx_type i, octave_idx_type j) const { #if defined (BOUNDS_CHECKING) return checkelem (i, j); #else return elem (i, j); #endif } // These are, in fact, super-fast. PermMatrix transpose (void) const; PermMatrix inverse (void) const; // Determinant, i.e. the sign of permutation. octave_idx_type determinant (void) const; // Efficient integer power of a permutation. PermMatrix power (octave_idx_type n) const; bool is_col_perm (void) const { return true; } bool is_row_perm (void) const { return false; } void print_info (std::ostream& os, const std::string& prefix) const { Array<octave_idx_type>::print_info (os, prefix); } static PermMatrix eye (octave_idx_type n); private: PermMatrix pos_power (octave_idx_type m) const; void setup (const Array<octave_idx_type>& p, bool colp, bool check); void setup (const idx_vector& idx, bool colp, octave_idx_type n); }; // Multiplying permutations together. PermMatrix OCTAVE_API operator * (const PermMatrix& a, const PermMatrix& b); #endif