Mercurial > octave-dspies

comparison test/logical-index.tst @ 19010:3fb030666878 draft default tip dspies

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added special-case logical-indexing function * logical-index.h (New file) : Logical-indexing function. May be called on octave_value types via call_bool_index * nz-iterators.h : Add base-class nz_iterator for iterator types. Array has template bool for whether to internally store row-col or compute on the fly Add skip_ahead method which skips forward to the next nonzero after its argument Add flat_index for computing octave_idx_type index of current position (with assertion failure in the case of overflow) Move is_zero to separate file * ov-base-diag.cc, ov-base-mat.cc, ov-base-sparse.cc, ov-perm.cc (do_index_op): Add call to call_bool_index in logical-index.h * Array.h : Move forward-declaration for array_iterator to separate header file * dim-vector.cc (dim_max): Refers to idx-bounds.h (max_idx) * array-iter-decl.h (New file): Header file for forward declaration of array-iterator * direction.h : Add constants fdirc and bdirc to avoid having to reconstruct them * dv-utils.h, dv-utils.cc (New files) : Utility functions for querying and constructing dim-vectors * idx-bounds.h (New file) : Utility constants and functions for determining whether things will overflow the maximum allowed bounds * interp-idx.h (New function : to_flat_idx) : Converts row-col pair to linear index of octave_idx_type * is-zero.h (New file) : Function for determining whether an element is zero * logical-index.tst : Add tests for correct return-value dimensions and large sparse matrix behavior
author David Spies <dnspies@gmail.com>
date Fri, 25 Jul 2014 13:39:31 -0600
parents d63878346099
children
comparison
equal deleted inserted replaced
19009:8d47ce2053f2 19010:3fb030666878
28 %!shared a 28 %!shared a
29 %! a = [9,8,7,6]; 29 %! a = [9,8,7,6];
30 %!assert (isempty (a(logical ([0,0,0,0])))) 30 %!assert (isempty (a(logical ([0,0,0,0]))))
31 %!assert (a(logical ([1,1,1,1])), [9,8,7,6]) 31 %!assert (a(logical ([1,1,1,1])), [9,8,7,6])
32 %!assert (a(logical ([0,1,1,0])), [8,7]) 32 %!assert (a(logical ([0,1,1,0])), [8,7])
33 %!assert (a(logical ([0;1;1;0])), [8,7])
33 %!assert (a(logical ([1,1])), [9,8]) 34 %!assert (a(logical ([1,1])), [9,8])
35
36 %! a = permute(a,[1,3,2]);
37 %!assert (a(logical ([0,1,1,0])), permute([8,7],[1,3,2]))
34 38
35 %!shared a 39 %!shared a
36 %! a = [9,8;7,6]; 40 %! a = [9,8;7,6];
37 %!assert (isempty (a(logical ([0,0,0,0])))) 41 %!assert (a(logical ([0,0,0,0])), zeros(1,0))
38 %!assert (a(logical ([1,1,1,1])), [9,7,8,6]) 42 %!assert (a(logical ([1,1,1,1])), [9,7,8,6])
39 %!assert (a(logical ([0,1,1,0])), [7,8]) 43 %!assert (a(logical ([0,1,1,0])), [7,8])
44 %!assert (a(logical ([0;1;1;0])), [7;8])
40 %!assert (a(logical (0:1),logical (0:1)), 6) 45 %!assert (a(logical (0:1),logical (0:1)), 6)
41 %!assert (a(logical (0:1),2:-1:1), [6,7]) 46 %!assert (a(logical (0:1),2:-1:1), [6,7])
42 %!assert (a(logical (0:1),logical ([0,1])), 6) 47 %!assert (a(logical (0:1),logical ([0,1])), 6)
43 %!assert (a(logical (0:1),[2,1]), [6,7]) 48 %!assert (a(logical (0:1),[2,1]), [6,7])
44 %!assert (a(logical (0:1),:), [7,6]) 49 %!assert (a(logical (0:1),:), [7,6])
69 %!assert (a(logical ([1,1]),[2,1]), [8,9;6,7]) 74 %!assert (a(logical ([1,1]),[2,1]), [8,9;6,7])
70 %!assert (a(logical ([1,1]),:), [9,8;7,6]) 75 %!assert (a(logical ([1,1]),:), [9,8;7,6])
71 %!assert (a(logical ([1,1]),1), [9;7]) 76 %!assert (a(logical ([1,1]),1), [9;7])
72 %!assert (a(logical ([1,1]),logical ([1,1])), [9,8;7,6]) 77 %!assert (a(logical ([1,1]),logical ([1,1])), [9,8;7,6])
73 78
79 %!assert (a(logical (permute([1,1,1,1],[1,3,2]))), [9;7;8;6])
80 %!assert (a(logical (permute([0,1,1,0],[1,3,2]))), [7;8])
81 %!assert (a(logical([])), [])
82 %!assert (a(false), [])
83 %!assert (a(false(0,0,1)), [])
84 %!assert (a(false(2,2)),zeros(0,1))
85 %!assert (a(false(1,4)),zeros(1,0))
86 %!assert (a(false(4,1)),zeros(0,1))
87 %!assert (a(false(1,1,4)),zeros(0,1))
88
89 %!shared v,a,b,c
90 %! v = sparse((1:100000).');
91 %! v = v .* mod(v,2);
92 %! a = sparse(diag(v));
93 %! b = logical(speye(100000));
94 %! c = [b(:,1:2:end); b(:,2:2:end)];
95 %!assert (a(b), v)
96 %!assert (a(c), v)