diff liboctave/array/DiagArray2.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 49a5a4be04a1
children
line wrap: on
line diff
--- a/liboctave/array/DiagArray2.h	Mon Aug 11 09:39:45 2014 -0700
+++ b/liboctave/array/DiagArray2.h	Tue Jun 17 16:41:11 2014 -0600
@@ -31,6 +31,11 @@
 
 #include "Array.h"
 
+//Forward declaration for diag_iterator,
+//the nonzero-iterator type for DiagArray2 (in nz_iterator.h)
+template<typename T>
+class diag_iterator;
+
 // Array<T> is inherited privately so that some methods, like index, don't
 // produce unexpected results.
 
@@ -45,6 +50,8 @@
 
   using typename Array<T>::element_type;
 
+  typedef diag_iterator<T> iter_type;
+
   DiagArray2 (void)
     : Array<T> (), d1 (0), d2 (0) { }