Mercurial > octave-dspies
view 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 |
line wrap: on
line source
/* Copyright (C) 2014 David Spies This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "dim-vector.h" #include <cassert> bool dv_is_extended_vector (const dim_vector& dv) { bool found = false; for (int i = 0; i < dv.length (); i++) { if (dv(i) != 1) { if (found) return false; else found = true; } } return found; } bool dv_is_scalar (const dim_vector& dv) { for (int i = 0; i < dv.length (); i++) { if (dv(i) != 1) return false; } return true; } bool dv_is_row (const dim_vector& dv) { return dv_is_extended_vector (dv) && dv(1) != 1; } //Returns the dimension along which a vector is a nonsingleton int dv_vector_dimension (const dim_vector& dv) { assert(dv_is_extended_vector (dv)); for (int i = 0; i < dv.length (); i++) { if (dv(i) != 1) return i; } liboctave_fatal ("No non-1 dimension"); } dim_vector dv_match_vector (const dim_vector& dv, octave_idx_type numel) { if(numel == 1) return dim_vector (1, 1); dim_vector res = dv; res (dv_vector_dimension (dv)) = numel; return res; }