Mercurial > hg > octave-lyh

comparison scripts/testfun/assert.m @ 16994:333243133364

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance. matrix concatenation is ~80% faster than cstrcat(). * doc/interpreter/strings.txi: Document preference for matrix concatenation as opposed to alternatives. * doc/interpreter/geometryimages.m, doc/interpreter/interpimages.m, doc/interpreter/plotimages.m, doc/interpreter/sparseimages.m, doc/interpreter/splineimages.m, scripts/general/genvarname.m, scripts/general/int2str.m, scripts/general/num2str.m, scripts/help/__makeinfo__.m, scripts/help/help.m, scripts/miscellaneous/copyfile.m, scripts/miscellaneous/dir.m, scripts/miscellaneous/edit.m, scripts/miscellaneous/fact.m, scripts/miscellaneous/fullfile.m, scripts/miscellaneous/mkoctfile.m, scripts/miscellaneous/movefile.m, scripts/miscellaneous/perl.m, scripts/miscellaneous/python.m, scripts/miscellaneous/run.m, scripts/miscellaneous/tempdir.m, scripts/miscellaneous/unpack.m, scripts/pkg/private/configure_make.m, scripts/pkg/private/create_pkgadddel.m, scripts/pkg/private/extract_pkg.m, scripts/pkg/private/get_description.m, scripts/pkg/private/get_forge_pkg.m, scripts/pkg/private/getarch.m, scripts/pkg/private/getarchprefix.m, scripts/pkg/private/install.m, scripts/pkg/private/installed_packages.m, scripts/pkg/private/load_packages_and_dependencies.m, scripts/pkg/private/rebuild.m, scripts/pkg/private/repackage.m, scripts/pkg/private/shell.m, scripts/pkg/private/uninstall.m, scripts/plot/private/__go_draw_axes__.m, scripts/signal/spectral_adf.m, scripts/signal/spectral_xdf.m, scripts/statistics/tests/z_test.m, scripts/statistics/tests/z_test_2.m, scripts/strings/mat2str.m, scripts/strings/strtok.m, scripts/testfun/__run_test_suite__.m, scripts/testfun/assert.m, scripts/testfun/demo.m, scripts/testfun/speed.m, scripts/testfun/test.m, test/eval-catch.tst, test/io.tst, test/try.tst: Replace cstrcat() with matrix concatenation where possible.
author Rik <rik@octave.org>
date Wed, 17 Jul 2013 14:02:32 -0700
parents 5d3a684236b0
children d6499c14021c
comparison
equal deleted inserted replaced
16993:78f57b14535c 16994:333243133364
59 59
60 function assert (cond, varargin) 60 function assert (cond, varargin)
61 61
62 in = deblank (argn(1,:)); 62 in = deblank (argn(1,:));
63 for i = 2:rows (argn) 63 for i = 2:rows (argn)
64 in = cstrcat (in, ",", deblank (argn(i,:))); 64 in = [in "," deblank(argn(i,:))];
65 endfor 65 endfor
66 in = cstrcat ("(", in, ")"); 66 in = ["(" in ")"];
67 67
68 if (nargin == 1 || (nargin > 1 && islogical (cond) && ischar (varargin{1}))) 68 if (nargin == 1 || (nargin > 1 && islogical (cond) && ischar (varargin{1})))
69 if ((! isnumeric (cond) && ! islogical (cond)) || ! all (cond(:))) 69 if ((! isnumeric (cond) && ! islogical (cond)) || ! all (cond(:)))
70 if (nargin == 1) 70 if (nargin == 1)
71 ## Say which elements failed? 71 ## Say which elements failed?
145 else 145 else
146 if (nargin < 3) 146 if (nargin < 3)
147 ## Without explicit tolerance, be more strict. 147 ## Without explicit tolerance, be more strict.
148 if (! strcmp (class (cond), class (expected))) 148 if (! strcmp (class (cond), class (expected)))
149 iserror = 1; 149 iserror = 1;
150 coda = cstrcat ("Class ", class (cond), " != ", class (expected)); 150 coda = ["Class " class (cond) " != " class(expected)];
151 elseif (isnumeric (cond)) 151 elseif (isnumeric (cond))
152 if (issparse (cond) != issparse (expected)) 152 if (issparse (cond) != issparse (expected))
153 if (issparse (cond)) 153 if (issparse (cond))
154 iserror = 1; 154 iserror = 1;
155 coda = "sparse != non-sparse"; 155 coda = "sparse != non-sparse";
226 str2 = disp (cond); 226 str2 = disp (cond);
227 idx = find (str2 != "\n"); 227 idx = find (str2 != "\n");
228 if (! isempty (idx)) 228 if (! isempty (idx))
229 str2 = str2 (idx(1):idx(end)); 229 str2 = str2 (idx(1):idx(end));
230 endif 230 endif
231 msg = cstrcat ("assert ", in, " expected\n", str, "\nbut got\n", str2); 231 msg = ["assert " in " expected\n" str "\nbut got\n" str2];
232 if (! isempty (coda)) 232 if (! isempty (coda))
233 msg = cstrcat (msg, "\n", coda); 233 msg = [msg, "\n", coda];
234 endif 234 endif
235 error ("%s", msg); 235 error ("%s", msg);
236 endif 236 endif
237 237
238 endfunction 238 endfunction