comparison liboctave/util/interp-idx.h @ 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 8d47ce2053f2
children
comparison
equal deleted inserted replaced
19009:8d47ce2053f2 19010:3fb030666878
20 20
21 */ 21 */
22 #if !defined (octave_interp_idx_h) 22 #if !defined (octave_interp_idx_h)
23 #define octave_interp_idx_h 1 23 #define octave_interp_idx_h 1
24 24
25 #include "idx-bounds.h"
26 #include "Array-util.h"
27
25 // Simple method for converting between C++ octave_idx_type and 28 // Simple method for converting between C++ octave_idx_type and
26 // Octave data-types (convert to double and add one). 29 // Octave data-types (convert to double and add one).
27 inline double 30 inline double
28 to_interp_idx (octave_idx_type idx) 31 to_interp_idx (octave_idx_type idx)
29 { 32 {
42 check_index (row, col, dims); 45 check_index (row, col, dims);
43 #endif 46 #endif
44 return col * static_cast<double> (dims(0)) + row + 1; 47 return col * static_cast<double> (dims(0)) + row + 1;
45 } 48 }
46 49
50 //Converts a row-column pair to a "flat" linear index.
51 //Asserts that its result won't overflow octave_idx_type
52 inline octave_idx_type
53 to_flat_idx (octave_idx_type row, octave_idx_type col, const dim_vector& dims)
54 {
55 assert(!row_col_to_idx_overflows (row, col, dims(0)));
56 return compute_index (row, col, dims, false);
57 }
58
47 #endif 59 #endif