Mercurial > octave-dspies
view liboctave/array/PermMatrix.h @ 19006:2e0613dadfee draft
All calls to "find" use the same generic implementation (bug #42408, 42421)
* find.cc: Rewrite.
Move generic "find" logic to find.h
(Ffind) : Changed calls to find_nonzero_elem_idx to find_templated
Added unit test for bug #42421
* Array.cc (and .h) (Array::find): Deleted function. Replaced with find::find(Array)
from find.h
* Array.h: Added typedef for array_iterator (in nz-iterators.h) as
Array::iter_type
* DiagArray2.h: Added typedef for diag_iterator (in nz-iterators.h) as
DiagArray2::iter_type
* PermMatrix.h: Added typedef for perm_iterator (in nz-iterators.h) as
PermMatrix::iter_type
Also added typedef for bool as PermMatrix::element_type
(not octave_idx_type)
Added an nnz() function (which is an alias for perm_length) and a
perm_elem(i) function for retrieving the ith element of the permutation
* Sparse.h: Added typedef for sparse_iterator (in nz-iterators.h) as
Sparse::iter_type
Added a short comment documenting the the argument to the numel
function
* idx-vector.cc (idx_vector::idx_mask_rep::as_array): Changed Array.find to
find::find(Array) (in find.h)
* (new file) find.h
* (new file) interp-idx.h: Simple methods for converting between interpreter
index type and internal octave_idx_type/row-col pair
* (new file) min-with-nnz.h: Fast methods for taking an arbitrary matrix M and
an octave_idx_type n and finding min(M.nnz(), n)
* (new file) nz-iterators.h: Iterators for traversing (in column-major order)
the nonzero elements of any array or matrix backwards or forwards
* (new file) direction.h: Generic methods for simplifying code has to deal with
a "backwards or forwards" template argument
* build-sparse-tests.sh: Removed 5-return-value calls to "find" in unit-tests;
Admittedly this commit breaks this "feature" which was undocumented and only
partially supported to begin with (ie never worked for full matrices,
permutation matrices, or diagonal matrices)
author | David Spies <dnspies@gmail.com> |
---|---|
date | Tue, 17 Jun 2014 16:41:11 -0600 |
parents | aa9ca67f09fb |
children |
line wrap: on
line source
/* Copyright (C) 2008-2013 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" //Forward declaration for perm_iterator, //the nonzero-iterator type for PermMatrix (in nz_iterator.h) class perm_iterator; // 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: typedef bool element_type; typedef perm_iterator iter_type; 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>::length (); } octave_idx_type dim2 (void) const { return Array<octave_idx_type>::length (); } 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>::length (); } // FIXME: a dangerous ambiguity? octave_idx_type length (void) const { return perm_length (); } octave_idx_type nelem (void) const { return dim1 () * dim2 (); } octave_idx_type numel (void) const { return nelem (); } octave_idx_type nnz (void) const { return perm_length (); } 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; } octave_idx_type perm_elem(octave_idx_type i) const { return Array<octave_idx_type>::elem (i); } 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