Mercurial > octave-nkf
annotate liboctave/MArray2.h @ 7789:82be108cc558
First attempt at single precision tyeps
* * *
corrections to qrupdate single precision routines
* * *
prefer demotion to single over promotion to double
* * *
Add single precision support to log2 function
* * *
Trivial PROJECT file update
* * *
Cache optimized hermitian/transpose methods
* * *
Add tests for tranpose/hermitian and ChangeLog entry for new transpose code
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Sun, 27 Apr 2008 22:34:17 +0200 |
| parents | 36594d5bbe13 |
| children | b756ce0002db |
| rev | line source |
|---|---|
| 1993 | 1 // Template array classes with like-type math ops |
| 1988 | 2 /* |
| 3 | |
| 7017 | 4 Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2007 |
| 5 John W. Eaton | |
| 1988 | 6 |
| 7 This file is part of Octave. | |
| 8 | |
| 9 Octave is free software; you can redistribute it and/or modify it | |
| 10 under the terms of the GNU General Public License as published by the | |
| 7016 | 11 Free Software Foundation; either version 3 of the License, or (at your |
| 12 option) any later version. | |
| 1988 | 13 |
| 14 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
| 7016 | 20 along with Octave; see the file COPYING. If not, see |
| 21 <http://www.gnu.org/licenses/>. | |
| 1988 | 22 |
| 23 */ | |
| 24 | |
| 25 #if !defined (octave_MArray2_h) | |
| 26 #define octave_MArray2_h 1 | |
| 27 | |
| 28 #include "Array2.h" | |
| 29 | |
| 3573 | 30 // Two dimensional array with math ops. |
| 3107 | 31 |
| 3573 | 32 // But first, some preprocessor abuse... |
| 3107 | 33 |
| 3573 | 34 #include "MArray-defs.h" |
| 3107 | 35 |
| 6708 | 36 MARRAY_OPS_FORWARD_DECLS (MArray2, ) |
| 1988 | 37 |
| 38 template <class T> | |
| 3585 | 39 class |
| 40 MArray2 : public Array2<T> | |
| 1988 | 41 { |
| 42 protected: | |
| 43 | |
| 5275 | 44 MArray2 (T *d, octave_idx_type n, octave_idx_type m) : Array2<T> (d, n, m) { } |
| 1988 | 45 |
| 46 public: | |
| 47 | |
| 48 MArray2 (void) : Array2<T> () { } | |
| 3585 | 49 |
| 5275 | 50 MArray2 (octave_idx_type n, octave_idx_type m) : Array2<T> (n, m) { } |
| 3585 | 51 |
| 5275 | 52 MArray2 (octave_idx_type n, octave_idx_type m, const T& val) : Array2<T> (n, m, val) { } |
| 3585 | 53 |
| 6979 | 54 MArray2 (const dim_vector& dv) : Array2<T> (dv) { } |
| 55 | |
| 56 MArray2 (const dim_vector& dv, const T& val) : Array2<T> (dv, val) { } | |
| 57 | |
| 3585 | 58 MArray2 (const MArray2<T>& a) : Array2<T> (a) { } |
| 59 | |
| 1988 | 60 MArray2 (const Array2<T>& a) : Array2<T> (a) { } |
| 61 | |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
62 template <class U> |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
63 MArray2 (const Array2<U>& a) : Array2<T> (a) { } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
64 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
65 template <class U> |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
66 MArray2 (const MArray2<U>& a) : Array2<T> (a) { } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
67 |
| 1988 | 68 ~MArray2 (void) { } |
| 69 | |
| 70 MArray2<T>& operator = (const MArray2<T>& a) | |
| 71 { | |
| 72 Array2<T>::operator = (a); | |
| 73 return *this; | |
| 74 } | |
| 75 | |
| 5275 | 76 MArray2<T>& insert (const Array2<T>& a, octave_idx_type r, octave_idx_type c) |
| 3225 | 77 { |
| 78 Array2<T>::insert (a, r, c); | |
| 79 return *this; | |
| 80 } | |
| 81 | |
| 82 MArray2<T> transpose (void) const { return Array2<T>::transpose (); } | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
83 MArray2<T> hermitian (T (*fcn) (const T&) = 0) const { return Array2<T>::hermitian (fcn); } |
| 1988 | 84 |
|
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
85 MArray2<T> diag (octave_idx_type k) const |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
86 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
87 return Array2<T>::diag (k); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
88 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
89 |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
90 template <class U, class F> |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
91 MArray2<U> map (F fcn) const |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
92 { |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
93 return Array2<T>::template map<U> (fcn); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
94 } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
95 |
| 3573 | 96 // Currently, the OPS functions don't need to be friends, but that |
| 97 // may change. | |
| 98 | |
| 3610 | 99 // MARRAY_OPS_FRIEND_DECLS (MArray2) |
| 3573 | 100 }; |
| 3107 | 101 |
| 1988 | 102 #endif |
| 103 | |
| 104 /* | |
| 105 ;;; Local Variables: *** | |
| 106 ;;; mode: C++ *** | |
| 107 ;;; End: *** | |
| 108 */ |