Mercurial > octave-dspies
view test/command.tst @ 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 | af8a70d6885c |
children |
line wrap: on
line source
## Don't alter the spacing in the command_test lines. These are ## specifically testing for possible differences in things like ## A(X) or A( X ) or A (X) or A ( X ) %!function command_test (varargin) %! assignin ('caller', 'cmd_out', ['|', sprintf('%s|', varargin{:})]); %!endfunction %!function gobble_command (varargin) %!endfunction ## 0, 1, 2, 3 simple arguments %!test %! command_test %! assert (cmd_out, '|') %!test %! command_test a %! assert (cmd_out, '|a|') %!test %! command_test aa b %! assert (cmd_out, '|aa|b|') %!test %! command_test aaa bb c %! assert (cmd_out, '|aaa|bb|c|') ## continuation %!test %! command_test a... %! bb ccc %! assert (cmd_out, '|a|bb|ccc|') %!test %! command_test a ... %! bb ccc %! assert (cmd_out, '|a|bb|ccc|') %!test %! command_test aa(... %! bb cc %! assert (cmd_out, '|aa(|bb|cc|') %!test %! command_test aa( ... %! bb cc %! assert (cmd_out, '|aa( |bb|cc|') ## comments %!test %! command_test aa bb cc%comment %! assert (cmd_out, '|aa|bb|cc|') %!test %! command_test aa bb cc#comment %! assert (cmd_out, '|aa|bb|cc|') %!test %! command_test aa bb cc %comment %! assert (cmd_out, '|aa|bb|cc|') %!test %! command_test aa bb cc #comment %! assert (cmd_out, '|aa|bb|cc|') %!test %! command_test aa bb cc( %comment %! assert (cmd_out, '|aa|bb|cc( |') %!test %! command_test aa bb cc( #comment %! assert (cmd_out, '|aa|bb|cc( |') ## semicolons and commas; multiple commands %!test %! command_test aa bb, gobble_command cc %! assert (cmd_out, '|aa|bb|') %!test %! command_test aa bb ; gobble_command cc %! assert (cmd_out, '|aa|bb|') %!test %! command_test aa bb ; command_test cc dd %! assert (cmd_out, '|cc|dd|') %!test %! command_test aa bb %!test %! command_test cc dd %! assert (cmd_out, '|cc|dd|') ## parenthesis matching %!test %! command_test aa(bb,cc,dd) ee(ff,gg) hh %! assert (cmd_out, '|aa(bb,cc,dd)|ee(ff,gg)|hh|') %!test %! command_test aa([bb,cc)] %! assert (cmd_out, '|aa([bb,cc)]|') %!test %! command_test aa(,@!$@"bb"'cc' %! assert (cmd_out, '|aa(,@!$@"bb"''cc''|') %!test %! command_test aa(bb,cc,dd) %! assert (cmd_out, '|aa(bb,cc,dd)|') %!test %! command_test aa( bb,cc,dd ) %! assert (cmd_out, '|aa( bb,cc,dd )|') %!test %! command_test aa (bb,cc,dd) %! assert (cmd_out, '|aa|(bb,cc,dd)|') %!test %! command_test aa ( bb,cc,dd ) %! assert (cmd_out, '|aa|( bb,cc,dd )|') %!test %! command_test aa(bb, cc, dd) %! assert (cmd_out, '|aa(bb, cc, dd)|') %!test %! command_test aa( bb, cc, dd ) %! assert (cmd_out, '|aa( bb, cc, dd )|') %!test %! command_test aa (bb, cc, dd) %! assert (cmd_out, '|aa|(bb, cc, dd)|') %!test %! command_test aa ( bb, cc, dd ) %! assert (cmd_out, '|aa|( bb, cc, dd )|') ## single and double quotes %!test %! command_test "aa" 'bb' cc %! assert (cmd_out, '|aa|bb|cc|') %!test %! command_test "aa"'bb'cc %! assert (cmd_out, '|aabbcc|') %!test %! command_test aa'bb'"cc" %! assert (cmd_out, '|aabbcc|') %!test %! command_test "aa"bb'cc' %! assert (cmd_out, '|aabbcc|') ## CVX-inspired %!test %! command_test Z(n,n) hermitian toeplitz %! assert (cmd_out, '|Z(n,n)|hermitian|toeplitz|') %!test %! command_test X( n, n ) symmetric %! assert (cmd_out, '|X( n, n )|symmetric|') %!test %! command_test xw( nm-1, nv ); %! assert (cmd_out, '|xw( nm-1, nv )|') %!test %! command_test x( sx ) y( sx ) z( sx ) %! assert (cmd_out, '|x( sx )|y( sx )|z( sx )|') %!test %! command_test coeffs(deg+1) complex; %! assert (cmd_out, '|coeffs(deg+1)|complex|') %!test %! command_test w( 1, npairs * nv ) v( 1, npairs * nv ) %! assert (cmd_out, '|w( 1, npairs * nv )|v( 1, npairs * nv )|') %!test %! command_test w(m,1) % edge weights %! assert (cmd_out, '|w(m,1)|') %!test %! command_test x2( size( x ) ) %! assert (cmd_out, '|x2( size( x ) )|')