Mercurial > octave-dspies
view test/for.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 | d63878346099 |
children |
line wrap: on
line source
## Copyright (C) 2006-2013 John W. Eaton ## ## 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/>. %!test %! for i = 1 %! __printf_assert__ ("%d", i); %! end # "end" is part of test, check not using "endfor" %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1")); %!test %! for i = 1:4 %! __printf_assert__ ("%d", i); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1234")); %!test %! for i = [1,2,3,4] %! __printf_assert__ ("%d", i); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1234")); %!test %! for i = [1,2;3,4] %! __printf_assert__ ("%d", i(1,1)); %! __printf_assert__ ("%d", i(2,1)); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1324")); %!test %! for i = I %! __printf_assert__ ("%d", imag (i)); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1")); %!test %! for i = [1,2,3,4]*I %! __printf_assert__ ("%d", imag (i)); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1234")); %!test %! for i = [1,2;3,4]*I %! __printf_assert__ ("%d", imag (i(1,1))); %! __printf_assert__ ("%d", imag (i(2,1))); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1324")); %!test %! for i = [1,2,3,4] %! if (i > 2) %! break; %! endif %! __printf_assert__ ("%d", i); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("12")); %!test %! for i = [1,2,3,4] %! if (i < 3) %! continue; %! endif %! __printf_assert__ ("%d", i); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("34")); %!test %! a = [1,3;2,4]; %! j = 0; %! for i = cat (3, a, 4 + a) %! assert (i, [1;2] + 2*j++) %! endfor %!test %! a = {1,3;2,4}; %! j = 0; %! for i = cat (3, a, cellfun (@(x) 4 + x, a, "UniformOutput", 0)) %! assert (i, {1 + 2*j; 2 + 2*j++}) %! endfor ## test parsing of single-quoted character string appearing at the ## beginning of a for loop %!test %! for i = 1:5 %! 'foo'; %! endfor %! assert (i, 5); %!test %! parfor i = 1 %! __printf_assert__ ("%d", i); %! end # "end" is part of test, check not using "endparfor" %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1")); %!test %! parfor i = 1:4 %! __printf_assert__ ("%d", i); %! endparfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1234"));