comparison libinterp/octave-value/ov-base-mat.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 bcd71a2531d3
children
comparison
equal deleted inserted replaced
19009:8d47ce2053f2 19010:3fb030666878
32 #include "oct-map.h" 32 #include "oct-map.h"
33 #include "ov-base.h" 33 #include "ov-base.h"
34 #include "ov-base-mat.h" 34 #include "ov-base-mat.h"
35 #include "ov-base-scalar.h" 35 #include "ov-base-scalar.h"
36 #include "pr-output.h" 36 #include "pr-output.h"
37 #include "logical-index.h"
37 38
38 template <class MT> 39 template <class MT>
39 octave_value 40 octave_value
40 octave_base_matrix<MT>::subsref (const std::string& type, 41 octave_base_matrix<MT>::subsref (const std::string& type,
41 const std::list<octave_value_list>& idx) 42 const std::list<octave_value_list>& idx)
144 retval = matrix; 145 retval = matrix;
145 break; 146 break;
146 147
147 case 1: 148 case 1:
148 { 149 {
149 idx_vector i = idx (0).index_vector (); 150 if (idx(0).is_bool_type ())
150 151 retval = call_bool_index (matrix, idx(0));
151 if (! error_state) 152 else
152 { 153 {
153 // optimize single scalar index. 154 idx_vector i = idx (0).index_vector ();
154 if (! resize_ok && i.is_scalar ()) 155
155 retval = cmatrix.checkelem (i(0)); 156 if (! error_state)
156 else 157 {
157 retval = MT (matrix.index (i, resize_ok)); 158 // optimize single scalar index.
159 if (! resize_ok && i.is_scalar ())
160 retval = cmatrix.checkelem (i(0));
161 else
162 retval = MT (matrix.index (i, resize_ok));
163 }
158 } 164 }
159 } 165 }
160 break; 166 break;
161 167
162 case 2: 168 case 2: