Mercurial > hg > octave-nkf
diff scripts/testfun/test.m @ 16994:333243133364
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 | 4e8f49304059 |
children | 7babcdb9bc13 |
line wrap: on
line diff
--- a/scripts/testfun/test.m +++ b/scripts/testfun/test.m @@ -155,10 +155,10 @@ ## Locate the file to test. __file = file_in_loadpath (__name, "all"); if (isempty (__file)) - __file = file_in_loadpath (cstrcat (__name, ".m"), "all"); + __file = file_in_loadpath ([__name ".m"], "all"); endif if (isempty (__file)) - __file = file_in_loadpath (cstrcat (__name, ".cc"), "all"); + __file = file_in_loadpath ([__name ".cc"], "all"); endif if (iscell (__file)) ## If repeats, return first in path. @@ -229,7 +229,7 @@ ## Ready to start tests ... if in batch mode, tell us what is happening. if (__verbose) - disp (cstrcat (__signal_file, __file)); + disp ([__signal_file, __file]); endif ## Assume all tests will pass. @@ -281,7 +281,7 @@ __demo_code = __code; __demo_idx = [1, length(__demo_code)+1]; else - __demo_code = cstrcat (__demo_code, __code); + __demo_code = [__demo_code, __code]; __demo_idx = [__demo_idx, length(__demo_code)+1]; endif @@ -326,9 +326,9 @@ try __vars = deblank (__vars); if (! isempty (__vars)) - eval (cstrcat (strrep (__vars, ",", "=[];"), "=[];")); + eval ([strrep(__vars, ",", "=[];"), "=[];"]); __shared = __vars; - __shared_r = cstrcat ("[ ", __vars, "] = "); + __shared_r = ["[ ", __vars, "] = "]; else __shared = " "; __shared_r = " "; @@ -686,7 +686,7 @@ if (length (ln) >= 2 && strcmp (ln(1:2), "%!")) body = [body, "\n"]; if (length (ln) > 2) - body = cstrcat (body, ln(3:end)); + body = [body, ln(3:end)]; endif endif endwhile