Mercurial > jwe > octave
view liboctave/array/MSparse.h @ 21139:538b57866b90
consistently use "typename" intead of "class" in template declarations
* Object.h, QtHandlesUtils.cc, QtHandlesUtils.h, ToolBarButton.cc,
ToolBarButton.h, Cell.h, __lin_interpn__.cc, bitfcns.cc, bsxfun.cc,
cellfun.cc, data.cc, filter.cc, gcd.cc, graphics.cc, help.cc, kron.cc,
lookup.cc, ls-mat5.cc, ls-oct-text.h, lu.cc, max.cc, mgorth.cc,
oct-map.cc, oct-map.h, oct-stream.cc, oct-stream.h, octave-link.h,
pr-output.cc, profiler.h, schur.cc, sparse-xdiv.cc, sparse-xpow.cc,
sqrtm.cc, symtab.h, tril.cc, typecast.cc, variables.cc, xdiv.cc,
zfstream.h, __init_fltk__.cc, __magick_read__.cc, chol.cc, qr.cc,
ov-base-diag.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h,
ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h,
ov-base-sparse.cc, ov-base-sparse.h, ov-base.h, ov-classdef.cc,
ov-int-traits.h, ov-java.h, ov-usr-fcn.h, ov.cc, ov.h,
op-dms-template.cc, oct-parse.in.yy, parse.h, pt-mat.cc, Array-b.cc,
Array.cc, Array.h, CDiagMatrix.h, CMatrix.h, CNDArray.h,
DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.cc,
MDiagArray2.h, MSparse.cc, MSparse.h, MatrixType.cc, Sparse.cc,
Sparse.h, dDiagMatrix.h, dMatrix.h, dNDArray.h, fCDiagMatrix.h,
fCMatrix.h, fCNDArray.h, fDiagMatrix.h, fMatrix.h, fNDArray.h,
idx-vector.cc, idx-vector.h, intNDArray.cc, intNDArray.h, DET.h,
base-aepbal.h, base-lu.cc, base-lu.h, base-qr.cc, base-qr.h,
bsxfun-defs.cc, eigs-base.cc, lo-mappers.h, lo-specfun.cc,
lo-specfun.h, oct-convn.cc, oct-fftw.cc, oct-norm.cc,
sparse-base-chol.cc, sparse-base-chol.h, sparse-base-lu.cc,
sparse-base-lu.h, sparse-dmsolve.cc, mx-inlines.cc,
action-container.h, base-list.h, lo-traits.h, lo-utils.h,
oct-base64.h, oct-binmap.h, oct-cmplx.h, oct-inttypes.cc,
oct-inttypes.h, oct-locbuf.h, oct-refcount.h, oct-sort.cc, oct-sort.h:
Use "typename" instead of "class" in template declarations.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 24 Jan 2016 13:50:04 -0500 |
parents | f7084eae3318 |
children | f7121e111991 |
line wrap: on
line source
/* Copyright (C) 2004-2015 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 #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <functional> #include "quit.h" #include "lo-error.h" #include "Sparse.h" #include "MArray.h" #include "Array-util.h" // Two dimensional sparse array with math ops. template <typename 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 <typename 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 <typename U> MSparse<U> map (U (&fcn) (T)) const { return Sparse<T>::template map<U> (fcn); } template <typename U> MSparse<U> map (U (&fcn) (const T&)) const { return Sparse<T>::template map<U> (fcn); } }; // Include operator templates for MSparse #include "MSparse.cc" // A macro that can be used to declare and instantiate OP= operators. #define SPARSE_OP_ASSIGN_DECL(T, OP, API) \ template API MSparse<T>& \ operator OP (MSparse<T>&, const MSparse<T>&) // A macro that can be used to declare and instantiate unary operators. #define SPARSE_UNOP_DECL(T, OP, API) \ template API MSparse<T> \ operator OP (const MSparse<T>&) // A macro that can be used to declare and instantiate binary operators. #define SPARSE_BINOP_DECL(A_T, T, F, API, X_T, Y_T) \ template API A_T<T> \ F (const X_T&, const Y_T&) // A function that can be used to forward OP= operations from derived // classes back to us. #define SPARSE_OP_ASSIGN_FWD_FCN(R, F, T, C_X, X_T, C_Y, Y_T) \ inline R \ F (X_T& x, const Y_T& y) \ { \ return R (F (C_X (x), C_Y (y))); \ } // A function that can be used to forward unary operations from derived // classes back to us. #define SPARSE_UNOP_FWD_FCN(R, F, T, C_X, X_T) \ inline R \ F (const X_T& x) \ { \ return R (F (C_X (x))); \ } // A function that can be used to forward binary operations from derived // classes back to us. #define SPARSE_BINOP_FWD_FCN(R, F, T, C_X, X_T, C_Y, Y_T) \ inline R \ F (const X_T& x, const Y_T& y) \ { \ return R (F (C_X (x), C_Y (y))); \ } // Instantiate all the MSparse friends for MSparse element type T. #define INSTANTIATE_SPARSE_FRIENDS(T, API) \ SPARSE_OP_ASSIGN_DECL (T, +=, API); \ SPARSE_OP_ASSIGN_DECL (T, -=, API); \ SPARSE_UNOP_DECL (T, +, API); \ SPARSE_UNOP_DECL (T, -, API); \ SPARSE_BINOP_DECL (MArray, T, operator +, API, MSparse<T>, T); \ SPARSE_BINOP_DECL (MArray, T, operator -, API, MSparse<T>, T); \ SPARSE_BINOP_DECL (MSparse, T, operator *, API, MSparse<T>, T); \ SPARSE_BINOP_DECL (MSparse, T, operator /, API, MSparse<T>, T); \ SPARSE_BINOP_DECL (MArray, T, operator +, API, T, MSparse<T>); \ SPARSE_BINOP_DECL (MArray, T, operator -, API, T, MSparse<T>); \ SPARSE_BINOP_DECL (MSparse, T, operator *, API, T, MSparse<T>); \ SPARSE_BINOP_DECL (MSparse, T, operator /, API, T, MSparse<T>); \ SPARSE_BINOP_DECL (MSparse, T, operator +, API, MSparse<T>, MSparse<T>); \ SPARSE_BINOP_DECL (MSparse, T, operator -, API, MSparse<T>, MSparse<T>); \ SPARSE_BINOP_DECL (MSparse, T, quotient, API, MSparse<T>, MSparse<T>); \ SPARSE_BINOP_DECL (MSparse, T, product, API, MSparse<T>, MSparse<T>); // Define all the MSparse forwarding functions for return type R and // MSparse element type T #define SPARSE_FORWARD_DEFS(B, R, F, T) \ SPARSE_OP_ASSIGN_FWD_FCN \ (R, operator +=, T, dynamic_cast<B<T>&>, R, dynamic_cast<const B<T>&>, R) \ SPARSE_OP_ASSIGN_FWD_FCN \ (R, operator -=, T, dynamic_cast<B<T>&>, R, dynamic_cast<const B<T>&>, R) \ SPARSE_UNOP_FWD_FCN (R, operator +, T, dynamic_cast<const B<T>&>, R) \ SPARSE_UNOP_FWD_FCN (R, operator -, T, dynamic_cast<const B<T>&>, R) \ SPARSE_BINOP_FWD_FCN (F, operator +, T, dynamic_cast<const B<T>&>, R, , T) \ SPARSE_BINOP_FWD_FCN (F, operator -, T, dynamic_cast<const B<T>&>, R, , T) \ SPARSE_BINOP_FWD_FCN (R, operator *, T, dynamic_cast<const B<T>&>, R, , T) \ SPARSE_BINOP_FWD_FCN (R, operator /, T, dynamic_cast<const B<T>&>, R, , T) \ SPARSE_BINOP_FWD_FCN (F, operator +, T, , T, dynamic_cast<const B<T>&>, R) \ SPARSE_BINOP_FWD_FCN (F, operator -, T, , T, dynamic_cast<const B<T>&>, R) \ SPARSE_BINOP_FWD_FCN (R, operator *, T, , T, dynamic_cast<const B<T>&>, R) \ SPARSE_BINOP_FWD_FCN (R, operator /, T, , T, dynamic_cast<const B<T>&>, R) \ SPARSE_BINOP_FWD_FCN \ (R, operator +, T, dynamic_cast<const B<T>&>, R, \ dynamic_cast<const B<T>&>, R) \ SPARSE_BINOP_FWD_FCN \ (R, operator -, T, dynamic_cast<const B<T>&>, R, \ dynamic_cast<const B<T>&>, R) \ SPARSE_BINOP_FWD_FCN \ (R, product, T, dynamic_cast<const B<T>&>, R, \ dynamic_cast<const B<T>&>, R) \ SPARSE_BINOP_FWD_FCN \ (R, quotient, T, dynamic_cast<const B<T>&>, R, \ dynamic_cast<const B<T>&>, R) #endif