Mercurial > hg > octave-avbm
comparison src/data.cc @ 4153:6b96ce9f5743
[project @ 2002-11-06 20:38:49 by jwe]
author | jwe |
---|---|
date | Wed, 06 Nov 2002 20:38:50 +0000 |
parents | a32457362437 |
children | b8ec44432831 |
comparison
equal
deleted
inserted
replaced
4152:f14251d33b01 | 4153:6b96ce9f5743 |
---|---|
29 | 29 |
30 #include <string> | 30 #include <string> |
31 | 31 |
32 #include "lo-ieee.h" | 32 #include "lo-ieee.h" |
33 #include "str-vec.h" | 33 #include "str-vec.h" |
34 #include "quit.h" | |
34 | 35 |
35 #include "defun.h" | 36 #include "defun.h" |
36 #include "error.h" | 37 #include "error.h" |
37 #include "gripes.h" | 38 #include "gripes.h" |
38 #include "oct-map.h" | 39 #include "oct-map.h" |
129 | 130 |
130 Matrix retval (nr, nc); | 131 Matrix retval (nr, nc); |
131 | 132 |
132 for (int j = 0; j < nc; j++) | 133 for (int j = 0; j < nc; j++) |
133 for (int i = 0; i < nr; i++) | 134 for (int i = 0; i < nr; i++) |
134 retval (i, j) = f (x, y (i, j)); | 135 { |
136 OCTAVE_QUIT; | |
137 retval (i, j) = f (x, y (i, j)); | |
138 } | |
135 | 139 |
136 return retval; | 140 return retval; |
137 } | 141 } |
138 | 142 |
139 static Matrix | 143 static Matrix |
144 | 148 |
145 Matrix retval (nr, nc); | 149 Matrix retval (nr, nc); |
146 | 150 |
147 for (int j = 0; j < nc; j++) | 151 for (int j = 0; j < nc; j++) |
148 for (int i = 0; i < nr; i++) | 152 for (int i = 0; i < nr; i++) |
149 retval (i, j) = f (x (i, j), y); | 153 { |
154 OCTAVE_QUIT; | |
155 retval (i, j) = f (x (i, j), y); | |
156 } | |
150 | 157 |
151 return retval; | 158 return retval; |
152 } | 159 } |
153 | 160 |
154 static Matrix | 161 static Matrix |
164 | 171 |
165 Matrix retval (x_nr, x_nc); | 172 Matrix retval (x_nr, x_nc); |
166 | 173 |
167 for (int j = 0; j < x_nc; j++) | 174 for (int j = 0; j < x_nc; j++) |
168 for (int i = 0; i < x_nr; i++) | 175 for (int i = 0; i < x_nr; i++) |
169 retval (i, j) = f (x (i, j), y (i, j)); | 176 { |
177 OCTAVE_QUIT; | |
178 retval (i, j) = f (x (i, j), y (i, j)); | |
179 } | |
170 | 180 |
171 return retval; | 181 return retval; |
172 } | 182 } |
173 | 183 |
174 DEFUN (atan2, args, , | 184 DEFUN (atan2, args, , |