comparison libinterp/octave-value/ov-base-diag.cc @ 19010:3fb030666878 draft default tip dspies

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 491b0adfec95
children
comparison
equal deleted inserted replaced
19009:8d47ce2053f2 19010:3fb030666878
35 #include "pr-output.h" 35 #include "pr-output.h"
36 #include "error.h" 36 #include "error.h"
37 #include "gripes.h" 37 #include "gripes.h"
38 #include "oct-stream.h" 38 #include "oct-stream.h"
39 #include "ops.h" 39 #include "ops.h"
40 #include "logical-index.h"
40 41
41 #include "ls-oct-ascii.h" 42 #include "ls-oct-ascii.h"
42 43
43 template <class DMT, class MT> 44 template <class DMT, class MT>
44 octave_value 45 octave_value
123 } 124 }
124 else 125 else
125 retval = to_dense ().do_index_op (idx, resize_ok); 126 retval = to_dense ().do_index_op (idx, resize_ok);
126 } 127 }
127 } 128 }
129 else if (idx.length () == 1 && idx(0).is_bool_type ())
130 retval = call_bool_index (matrix, idx(0));
128 else 131 else
129 retval = to_dense ().do_index_op (idx, resize_ok); 132 retval = to_dense ().do_index_op (idx, resize_ok);
130 133
131 return retval; 134 return retval;
132 } 135 }