Mercurial > octave-nkf
annotate liboctave/DiagArray2.cc @ 8375:e3c9102431a9
fix design problems of diag & perm matrix classes
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Fri, 05 Dec 2008 10:20:18 +0100 |
parents | 8b1a2555c4e2 |
children | ad3afaaa19c1 |
rev | line source |
---|---|
1993 | 1 // Template array classes |
1988 | 2 /* |
3 | |
7017 | 4 Copyright (C) 1996, 1997, 1999, 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 #ifdef HAVE_CONFIG_H | |
26 #include <config.h> | |
27 #endif | |
28 | |
29 #include <cassert> | |
30 | |
3503 | 31 #include <iostream> |
1988 | 32 |
8375
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
33 #include <algorithm> |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
34 |
1988 | 35 #include "DiagArray2.h" |
36 | |
37 #include "lo-error.h" | |
38 | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
39 template <class T> |
8375
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
40 Array<T> |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
41 DiagArray2<T>::diag (octave_idx_type k) const |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
42 { |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
43 Array<T> d; |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
44 |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
45 if (k == 0) |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
46 { |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
47 // The main diagonal is shallow-copied. |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
48 d = *this; |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
49 d.dimensions = dim_vector (length ()); |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
50 } |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
51 else if (k > 0 && k < cols ()) |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
52 d = Array<T> (std::min (cols () - k, rows ()), T ()); |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
53 else if (k < 0 && -k < rows ()) |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
54 d = Array<T> (std::min (rows () + k, cols ()), T ()); |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
55 else |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
56 (*current_liboctave_error_handler) |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
57 ("diag: requested diagonal out of range"); |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
58 |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
59 return d; |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
60 } |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
61 |
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
62 template <class T> |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
63 DiagArray2<T> |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
64 DiagArray2<T>::transpose (void) const |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
65 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
66 DiagArray2<T> retval (*this); |
8375
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
67 retval.dimensions = dim_vector (dim2 (), dim1 ()); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
68 return retval; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
69 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
70 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
71 template <class T> |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
72 DiagArray2<T> |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
73 DiagArray2<T>::hermitian (T (* fcn) (const T&)) const |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
74 { |
8375
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
75 DiagArray2<T> retval (dim2 (), dim1 ()); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
76 const T *p = this->data (); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
77 T *q = retval.fortran_vec (); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
78 for (octave_idx_type i = 0; i < this->length (); i++) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
79 q [i] = fcn (p [i]); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
80 return retval; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
81 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
82 |
1988 | 83 // A two-dimensional array with diagonal elements only. |
84 | |
85 template <class T> | |
86 T | |
5275 | 87 DiagArray2<T>::checkelem (octave_idx_type r, octave_idx_type c) const |
1988 | 88 { |
8375
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
89 if (r < 0 || c < 0 || r >= dim1 () || c >= dim2 ()) |
1988 | 90 { |
3928 | 91 (*current_liboctave_error_handler) ("range error in DiagArray2"); |
3333 | 92 return T (); |
1988 | 93 } |
94 return (r == c) ? Array<T>::xelem (r) : T (0); | |
95 } | |
96 | |
97 template <class T> | |
98 void | |
5275 | 99 DiagArray2<T>::resize (octave_idx_type r, octave_idx_type c) |
1988 | 100 { |
101 if (r < 0 || c < 0) | |
102 { | |
103 (*current_liboctave_error_handler) ("can't resize to negative dimensions"); | |
104 return; | |
105 } | |
106 | |
8375
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
107 if (r == dim1 () && c == dim2 ()) |
1988 | 108 return; |
109 | |
4323 | 110 typename Array<T>::ArrayRep *old_rep = Array<T>::rep; |
4645 | 111 const T *old_data = this->data (); |
5275 | 112 octave_idx_type old_len = this->length (); |
1988 | 113 |
5275 | 114 octave_idx_type new_len = r < c ? r : c; |
1988 | 115 |
4323 | 116 Array<T>::rep = new typename Array<T>::ArrayRep (new_len); |
1988 | 117 |
4645 | 118 this->dimensions = dim_vector (r, c); |
1988 | 119 |
120 if (old_data && old_len > 0) | |
121 { | |
5275 | 122 octave_idx_type min_len = old_len < new_len ? old_len : new_len; |
1988 | 123 |
5275 | 124 for (octave_idx_type i = 0; i < min_len; i++) |
1988 | 125 xelem (i, i) = old_data[i]; |
126 } | |
127 | |
128 if (--old_rep->count <= 0) | |
129 delete old_rep; | |
130 } | |
131 | |
132 template <class T> | |
133 void | |
5275 | 134 DiagArray2<T>::resize (octave_idx_type r, octave_idx_type c, const T& val) |
1988 | 135 { |
136 if (r < 0 || c < 0) | |
137 { | |
138 (*current_liboctave_error_handler) ("can't resize to negative dimensions"); | |
139 return; | |
140 } | |
141 | |
8375
e3c9102431a9
fix design problems of diag & perm matrix classes
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
142 if (r == dim1 () && c == dim2 ()) |
1988 | 143 return; |
144 | |
4323 | 145 typename Array<T>::ArrayRep *old_rep = Array<T>::rep; |
4645 | 146 const T *old_data = this->data (); |
5275 | 147 octave_idx_type old_len = this->length (); |
1988 | 148 |
5275 | 149 octave_idx_type new_len = r < c ? r : c; |
1988 | 150 |
4323 | 151 Array<T>::rep = new typename Array<T>::ArrayRep (new_len); |
1988 | 152 |
4645 | 153 this->dimensions = dim_vector (r, c); |
1988 | 154 |
5275 | 155 octave_idx_type min_len = old_len < new_len ? old_len : new_len; |
1988 | 156 |
157 if (old_data && old_len > 0) | |
158 { | |
5275 | 159 for (octave_idx_type i = 0; i < min_len; i++) |
1988 | 160 xelem (i, i) = old_data[i]; |
161 } | |
162 | |
5275 | 163 for (octave_idx_type i = min_len; i < new_len; i++) |
1988 | 164 xelem (i, i) = val; |
165 | |
166 if (--old_rep->count <= 0) | |
167 delete old_rep; | |
168 } | |
169 | |
170 /* | |
171 ;;; Local Variables: *** | |
172 ;;; mode: C++ *** | |
173 ;;; End: *** | |
174 */ |