Mercurial > octave-dspies
comparison liboctave/array/dim-vector.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 |
comparison
equal
deleted
inserted
replaced
19003:d00f6b09258f | 19006:2e0613dadfee |
---|---|
337 return (num_ones () == length ()); | 337 return (num_ones () == length ()); |
338 } | 338 } |
339 | 339 |
340 // Return the number of elements that a matrix with this dimension | 340 // Return the number of elements that a matrix with this dimension |
341 // vector would have, NOT the number of dimensions (elements in the | 341 // vector would have, NOT the number of dimensions (elements in the |
342 // dimension vector). | 342 // dimension vector). If given an argument n, returns the number of |
343 // elements an array with dimensions dim[n..end] would have | |
344 // (ex. numel(1) returns the number of columns) | |
343 | 345 |
344 octave_idx_type numel (int n = 0) const | 346 octave_idx_type numel (int n = 0) const |
345 { | 347 { |
346 int n_dims = length (); | 348 int n_dims = length (); |
347 | 349 |