Mercurial > hg > octave-nkf

comparison scripts/general/num2str.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 12005245b645
children c5073ed27cdc
comparison
equal deleted inserted replaced
16993:78f57b14535c 16994:333243133364
113 else 113 else
114 ## Logical input 114 ## Logical input
115 fmt = "%3d"; 115 fmt = "%3d";
116 endif 116 endif
117 endif 117 endif
118 fmt = cstrcat (deblank (repmat (fmt, 1, columns (x))), "\n"); 118 fmt = [deblank(repmat(fmt, 1, columns(x))), "\n"];
119 nd = ndims (x); 119 nd = ndims (x);
120 tmp = sprintf (fmt, permute (x, [2, 1, 3:nd])); 120 tmp = sprintf (fmt, permute (x, [2, 1, 3:nd]));
121 retval = strtrim (char (ostrsplit (tmp(1:end-1), "\n"))); 121 retval = strtrim (char (ostrsplit (tmp(1:end-1), "\n")));
122 else # Complex matrix input 122 else # Complex matrix input
123 if (nargin == 2) 123 if (nargin == 2)
124 if (ischar (arg)) 124 if (ischar (arg))
125 fmt = cstrcat (arg, "%-+", arg(2:end), "i"); 125 fmt = [arg "%-+" arg(2:end) "i"];
126 elseif (isnumeric (arg) && isscalar (arg) && arg >= 0) 126 elseif (isnumeric (arg) && isscalar (arg) && arg >= 0)
127 fmt = sprintf ("%%%d.%dg%%-+%d.%dgi", arg+7, arg, arg+7, arg); 127 fmt = sprintf ("%%%d.%dg%%-+%d.%dgi", arg+7, arg, arg+7, arg);
128 else 128 else
129 error ("num2str: PRECISION must be a scalar integer >= 0"); 129 error ("num2str: PRECISION must be a scalar integer >= 0");
130 endif 130 endif
155 perm(2:2:2*nc) = nc + (1:nc); 155 perm(2:2:2*nc) = nc + (1:nc);
156 idx{2} = perm; 156 idx{2} = perm;
157 x = horzcat (real (x), imag (x)); 157 x = horzcat (real (x), imag (x));
158 x = x(idx{:}); 158 x = x(idx{:});
159 159
160 fmt = cstrcat (deblank (repmat (fmt, 1, nc)), "\n"); 160 fmt = [deblank(repmat(fmt, 1, nc)), "\n"];
161 tmp = sprintf (fmt, permute (x, [2, 1, 3:nd])); 161 tmp = sprintf (fmt, permute (x, [2, 1, 3:nd]));
162 162
163 ## Put the "i"'s where they are supposed to be. 163 ## Put the "i"'s where they are supposed to be.
164 tmp = regexprep (tmp, " +i\n", "i\n"); 164 tmp = regexprep (tmp, " +i\n", "i\n");
165 tmp = regexprep (tmp, "( +)i", "i$1"); 165 tmp = regexprep (tmp, "( +)i", "i$1");