Mercurial > octave-dspies
view liboctave/array/MSparse.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 | 49a5a4be04a1 |
children |
line wrap: on
line source
/* Copyright (C) 2004-2013 David Bateman Copyright (C) 1998-2004 Andy Adler 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/>. */ #if !defined (octave_MSparse_h) #define octave_MSparse_h 1 #include "MArray.h" #include "Sparse.h" // Two dimensional sparse array with math ops. // But first, some preprocessor abuse... #include "MSparse-defs.h" SPARSE_OPS_FORWARD_DECLS (MSparse, MArray, ) template <class T> class MSparse : public Sparse<T> { public: MSparse (void) : Sparse<T> () { } MSparse (octave_idx_type n, octave_idx_type m) : Sparse<T> (n, m) { } MSparse (const dim_vector& dv, octave_idx_type nz = 0) : Sparse<T> (dv, nz) { } MSparse (const MSparse<T>& a) : Sparse<T> (a) { } MSparse (const MSparse<T>& a, const dim_vector& dv) : Sparse<T> (a, dv) { } MSparse (const Sparse<T>& a) : Sparse<T> (a) { } template <class U> MSparse (const Sparse<U>& a) : Sparse<T> (a) { } MSparse (const Array<T>& a, const idx_vector& r, const idx_vector& c, octave_idx_type nr = -1, octave_idx_type nc = -1, bool sum_terms = true, octave_idx_type nzm = -1) : Sparse<T> (a, r, c, nr, nc, sum_terms, nzm) { } explicit MSparse (octave_idx_type r, octave_idx_type c, T val) : Sparse<T> (r, c, val) { } explicit MSparse (const PermMatrix& a) : Sparse<T>(a) { } MSparse (octave_idx_type r, octave_idx_type c, octave_idx_type num_nz) : Sparse<T> (r, c, num_nz) { } ~MSparse (void) { } MSparse<T>& operator = (const MSparse<T>& a) { Sparse<T>::operator = (a); return *this; } MSparse<T>& insert (const Sparse<T>& a, octave_idx_type r, octave_idx_type c) { Sparse<T>::insert (a, r, c); return *this; } MSparse<T>& insert (const Sparse<T>& a, const Array<octave_idx_type>& indx) { Sparse<T>::insert (a, indx); return *this; } MSparse<T> transpose (void) const { return Sparse<T>::transpose (); } MSparse<T> squeeze (void) const { return Sparse<T>::squeeze (); } MSparse<T> reshape (const dim_vector& new_dims) const { return Sparse<T>::reshape (new_dims); } MSparse<T> permute (const Array<octave_idx_type>& vec, bool inv = false) const { return Sparse<T>::permute (vec, inv); } MSparse<T> ipermute (const Array<octave_idx_type>& vec) const { return Sparse<T>::ipermute (vec); } MSparse<T> diag (octave_idx_type k = 0) const { return Sparse<T>::diag (k); } // FIXME: should go away. template <class U> MSparse<U> map (U (&fcn) (T)) const { return Sparse<T>::template map<U> (fcn); } template <class U> MSparse<U> map (U (&fcn) (const T&)) const { return Sparse<T>::template map<U> (fcn); } // Currently, the OPS functions don't need to be friends, but that // may change. // SPARSE_OPS_FRIEND_DECLS (MSparse, MArray) }; #endif