Mercurial > hg > octave-lyh
comparison scripts/testfun/speed.m @ 13276:d5c8c2fe2eed
speed.m: Further fixes for 2 speed tests (Bug #34234)
* speed.m: Check only that size of T_f2 is in range 10-15. It need
not match size of n or T_f1.
author | Rik <octave@nomad.inbox5.com> |
---|---|
date | Wed, 05 Oct 2011 08:52:35 -0700 |
parents | b48e11427ac0 |
children | 5d3d802c772e |
comparison
equal
deleted
inserted
replaced
13275:635db52feab4 | 13276:d5c8c2fe2eed |
---|---|
154 if (nargin < 1 || nargin > 6) | 154 if (nargin < 1 || nargin > 6) |
155 print_usage (); | 155 print_usage (); |
156 endif | 156 endif |
157 | 157 |
158 if (nargin < 2 || isempty (__init)) | 158 if (nargin < 2 || isempty (__init)) |
159 __init = "x = randn(n, 1);"; | 159 __init = "x = randn (n, 1);"; |
160 endif | 160 endif |
161 | 161 |
162 if (nargin < 3 || isempty (__max_n)) | 162 if (nargin < 3 || isempty (__max_n)) |
163 __max_n = 100; | 163 __max_n = 100; |
164 endif | 164 endif |
394 %! assert (isstruct (order)); | 394 %! assert (isstruct (order)); |
395 %! assert (size (order), [1, 1]); | 395 %! assert (size (order), [1, 1]); |
396 %! assert (fieldnames (order), {"p"; "a"}); | 396 %! assert (fieldnames (order), {"p"; "a"}); |
397 %! assert (isnumeric (n)); | 397 %! assert (isnumeric (n)); |
398 %! assert (length (n) > 10); | 398 %! assert (length (n) > 10); |
399 %! n_sz = size (n); | |
400 %! assert (isnumeric (T_f1)); | 399 %! assert (isnumeric (T_f1)); |
401 %! assert (size (T_f1), n_sz); | 400 %! assert (size (T_f1), size (n)); |
402 %! assert (isnumeric (T_f2)); | 401 %! assert (isnumeric (T_f2)); |
403 %! assert (size (T_f2), n_sz); | 402 %! assert (length (T_f2) > 10); |
404 | 403 |
405 %!test | 404 %!test |
406 %! [order, n, T_f1, T_f2] = speed ("sum (x)", "", [100, 1000], "v = 0; for i = 1:length (x), v += x(i); end"); | 405 %! [order, n, T_f1, T_f2] = speed ("sum (x)", "", [100, 1000], "v = 0; for i = 1:length (x), v += x(i); endfor"); |
407 %! assert (isstruct (order)); | 406 %! assert (isstruct (order)); |
408 %! assert (size (order), [1, 1]); | 407 %! assert (size (order), [1, 1]); |
409 %! assert (fieldnames (order), {"p"; "a"}); | 408 %! assert (fieldnames (order), {"p"; "a"}); |
410 %! assert (isnumeric (n)); | 409 %! assert (isnumeric (n)); |
411 %! assert (length (n) > 10); | 410 %! assert (length (n) > 10); |
412 %! n_sz = size (n); | |
413 %! assert (size (n), [1, 15]); | |
414 %! assert (isnumeric (T_f1)); | 411 %! assert (isnumeric (T_f1)); |
415 %! assert (size (T_f1), n_sz); | 412 %! assert (size (T_f1), size (n)); |
416 %! assert (isnumeric (T_f2)); | 413 %! assert (isnumeric (T_f2)); |
417 %! assert (size (T_f2), n_sz); | 414 %! assert (length (T_f2) > 10); |
418 | 415 |
419 %% Test input validation | 416 %% Test input validation |
420 %!error speed (); | 417 %!error speed (); |
421 %!error speed (1, 2, 3, 4, 5, 6, 7); | 418 %!error speed (1, 2, 3, 4, 5, 6, 7); |
422 | 419 |