Mercurial > octave-dspies
comparison liboctave/util/dv-utils.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 | |
children |
comparison
equal
deleted
inserted
replaced
19009:8d47ce2053f2 | 19010:3fb030666878 |
---|---|
1 /* | |
2 | |
3 Copyright (C) 2014 David Spies | |
4 | |
5 This file is part of Octave. | |
6 | |
7 Octave is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
9 Free Software Foundation; either version 3 of the License, or (at your | |
10 option) any later version. | |
11 | |
12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with Octave; see the file COPYING. If not, see | |
19 <http://www.gnu.org/licenses/>. | |
20 | |
21 */ | |
22 | |
23 #ifdef HAVE_CONFIG_H | |
24 #include <config.h> | |
25 #endif | |
26 | |
27 #include "dim-vector.h" | |
28 #include <cassert> | |
29 | |
30 bool | |
31 dv_is_extended_vector (const dim_vector& dv) | |
32 { | |
33 bool found = false; | |
34 for (int i = 0; i < dv.length (); i++) | |
35 { | |
36 if (dv(i) != 1) | |
37 { | |
38 if (found) | |
39 return false; | |
40 else | |
41 found = true; | |
42 } | |
43 } | |
44 return found; | |
45 } | |
46 | |
47 bool | |
48 dv_is_scalar (const dim_vector& dv) | |
49 { | |
50 for (int i = 0; i < dv.length (); i++) | |
51 { | |
52 if (dv(i) != 1) | |
53 return false; | |
54 } | |
55 return true; | |
56 } | |
57 | |
58 bool | |
59 dv_is_row (const dim_vector& dv) | |
60 { | |
61 return dv_is_extended_vector (dv) && dv(1) != 1; | |
62 } | |
63 | |
64 //Returns the dimension along which a vector is a nonsingleton | |
65 int | |
66 dv_vector_dimension (const dim_vector& dv) | |
67 { | |
68 assert(dv_is_extended_vector (dv)); | |
69 for (int i = 0; i < dv.length (); i++) | |
70 { | |
71 if (dv(i) != 1) | |
72 return i; | |
73 } | |
74 liboctave_fatal ("No non-1 dimension"); | |
75 } | |
76 | |
77 dim_vector | |
78 dv_match_vector (const dim_vector& dv, octave_idx_type numel) | |
79 { | |
80 if(numel == 1) | |
81 return dim_vector (1, 1); | |
82 dim_vector res = dv; | |
83 res (dv_vector_dimension (dv)) = numel; | |
84 return res; | |
85 } |