octave-antonio: scripts/strings/mat2str.m annotate

annotate scripts/strings/mat2str.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	5d3a684236b0
children	bc924baa2c4e

rev	line source
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 13314 diff changeset	1 ## Copyright (C) 2002-2012 Rolf Fabian
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	2 ##
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	3 ## This file is part of Octave.
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	4 ##
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	5 ## Octave is free software; you can redistribute it and/or modify it
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	6 ## under the terms of the GNU General Public License as published by
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	7 ## the Free Software Foundation; either version 3 of the License, or (at
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	8 ## your option) any later version.
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	9 ##
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	10 ## Octave is distributed in the hope that it will be useful, but
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	13 ## General Public License for more details.
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	14 ##
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	15 ## You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	16 ## along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	17 ## <http://www.gnu.org/licenses/>.
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	18
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	19 ## -- texinfo --
10793 be55736a0783 Grammarcheck the documentation from m-files. Rik <octave@nomad.inbox5.com> parents: 9036 diff changeset	20 ## @deftypefn {Function File} {@var{s} =} mat2str (@var{x}, @var{n})
13180 c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	21 ## @deftypefnx {Function File} {@var{s} =} mat2str (@var{x}, @var{n}, "class")
13314 da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	22 ## Format real, complex, and logical matrices as strings. The
da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	23 ## returned string may be used to reconstruct the original matrix by using
da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	24 ## the @code{eval} function.
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	25 ##
9036 58604c45ca74 Cleanup of data types related documentation Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	26 ## The precision of the values is given by @var{n}. If @var{n} is a
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	27 ## scalar then both real and imaginary parts of the matrix are printed
13180 c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	28 ## to the same precision. Otherwise @code{@var{n}(1)} defines the
c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	29 ## precision of the real part and @code{@var{n}(2)} defines the
12611 708186085e0d mat2str.m: Limit the number of digits to one less than available for double. Patrick Häcker <magicmuscleman> parents: 11587 diff changeset	30 ## precision of the imaginary part. The default for @var{n} is 15.
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	31 ##
13314 da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	32 ## If the argument "class" is given then the class of @var{x} is
13180 c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	33 ## included in the string in such a way that @code{eval} will result in the
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	34 ## construction of a matrix of the same class.
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	35 ##
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	36 ## @example
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	37 ## @group
8507 cadc73247d65 style fixes John W. Eaton <jwe@octave.org> parents: 8442 diff changeset	38 ## mat2str ([ -1/3 + i/7; 1/3 - i/7 ], [4 2])
8442 502e58a0d44f Fix docstrings, add examples, references and tests to string functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 7812 diff changeset	39 ## @result{} "[-0.3333+0.14i;0.3333-0.14i]"
502e58a0d44f Fix docstrings, add examples, references and tests to string functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 7812 diff changeset	40 ##
8507 cadc73247d65 style fixes John W. Eaton <jwe@octave.org> parents: 8442 diff changeset	41 ## mat2str ([ -1/3 +i/7; 1/3 -i/7 ], [4 2])
13314 da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	42 ## @result{} "[-0.3333+0i 0+0.14i;0.3333+0i -0-0.14i]"
8442 502e58a0d44f Fix docstrings, add examples, references and tests to string functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 7812 diff changeset	43 ##
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14363 diff changeset	44 ## mat2str (int16 ([1 -1]), "class")
13314 da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	45 ## @result{} "int16([1 -1])"
da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	46 ##
da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	47 ## mat2str (logical (eye (2)))
da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	48 ## @result{} "[true false;false true]"
da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	49 ##
da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	50 ## isequal (x, eval (mat2str (x)))
da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	51 ## @result{} 1
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	52 ## @end group
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	53 ## @end example
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	54 ##
8442 502e58a0d44f Fix docstrings, add examples, references and tests to string functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 7812 diff changeset	55 ## @seealso{sprintf, num2str, int2str}
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	56 ## @end deftypefn
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	57
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	58 ## Author: Rolf Fabian <fabian@tu-cottbus.de>
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	59
13314 da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	60 function s = mat2str (x, n = 15, cls = "")
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	61
13180 c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	62 if (nargin < 1 \|\| nargin > 3 \|\| ! (isnumeric (x) \|\| islogical (x)))
c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	63 print_usage ();
13314 da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	64 elseif (ndims (x) > 2)
13180 c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	65 error ("mat2str: X must be two dimensional");
c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	66 endif
c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	67
13314 da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	68 if (nargin == 2 && ischar (n))
da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	69 cls = n;
da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	70 n = 15;
da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	71 elseif (isempty (n))
13180 c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	72 n = 15; # Default precision
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	73 endif
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	74
11485 571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	75 x_islogical = islogical (x);
7812 c25094267486 strings/mat2str.m: Change is_complex to iscomplex, add tests, add missing ; kimhanse@gmail.com parents: 7017 diff changeset	76 x_iscomplex = iscomplex (x);
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	77
11485 571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	78 if (x_iscomplex)
13314 da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	79 if (isscalar (n))
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	80 n = [n, n];
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	81 endif
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	82 fmt = sprintf ("%%.%dg%%+.%dgi", n(1), n(2));
11485 571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	83 elseif (x_islogical)
571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	84 v = {"false", "true"};
571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	85 fmt = "%s";
571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	86 else
571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	87 fmt = sprintf ("%%.%dg", n(1));
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	88 endif
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	89
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	90 nel = numel (x);
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	91
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	92 if (nel == 0)
376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	93 ## Empty, only print brackets
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	94 s = "[]";
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	95 elseif (nel == 1)
376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	96 ## Scalar X, don't print brackets
11485 571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	97 if (x_iscomplex)
571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	98 s = sprintf (fmt, real (x), imag (x));
571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	99 elseif (x_islogical)
571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	100 s = v{x+1};
571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	101 else
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	102 s = sprintf (fmt, x);
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	103 endif
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	104 else
376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	105 ## Non-scalar X, print brackets
16994 333243133364 Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance. Rik <rik@octave.org> parents: 14868 diff changeset	106 fmt = [fmt " "];
11485 571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	107 if (x_iscomplex)
7812 c25094267486 strings/mat2str.m: Change is_complex to iscomplex, add tests, add missing ; kimhanse@gmail.com parents: 7017 diff changeset	108 t = x.';
c25094267486 strings/mat2str.m: Change is_complex to iscomplex, add tests, add missing ; kimhanse@gmail.com parents: 7017 diff changeset	109 s = sprintf (fmt, [real(t(:))'; imag(t(:))']);
11485 571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	110 elseif (x_islogical)
571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	111 t = v(x+1);
571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	112 s = cstrcat (sprintf (fmt, t{:}));
571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	113 else
571bfa4fc295 mat2str: handle logical arguments John W. Eaton <jwe@octave.org> parents: 10793 diff changeset	114 s = sprintf (fmt, x.');
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	115 endif
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	116
16994 333243133364 Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance. Rik <rik@octave.org> parents: 14868 diff changeset	117 s = ["[" s];
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	118 s(end) = "]";
13314 da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	119 idx = strfind (s, " ");
5946 4b433225128d [project @ 2006-08-21 15:54:50 by jwe] jwe parents: 5838 diff changeset	120 nc = columns (x);
13180 c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	121 s(idx(nc:nc:end)) = ";";
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	122 endif
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	123
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	124 if (strcmp ("class", cls))
16994 333243133364 Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance. Rik <rik@octave.org> parents: 14868 diff changeset	125 s = [class(x) "(" s ")"];
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	126 endif
13180 c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	127
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	128 endfunction
7812 c25094267486 strings/mat2str.m: Change is_complex to iscomplex, add tests, add missing ; kimhanse@gmail.com parents: 7017 diff changeset	129
13180 c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	130
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	131 %!assert (mat2str (0.7), "0.7")
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	132 %!assert (mat2str (pi), "3.14159265358979")
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	133 %!assert (mat2str (pi, 5), "3.1416")
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	134 %!assert (mat2str (single (pi), 5, "class"), "single(3.1416)")
7812 c25094267486 strings/mat2str.m: Change is_complex to iscomplex, add tests, add missing ; kimhanse@gmail.com parents: 7017 diff changeset	135 %!assert (mat2str ([-1/3 + i/7; 1/3 - i/7], [4 2]), "[-0.3333+0.14i;0.3333-0.14i]")
13314 da56d27164fe mat2str.m: Tune function for Matlab compatability and speed. Rik <octave@nomad.inbox5.com> parents: 13180 diff changeset	136 %!assert (mat2str ([-1/3 +i/7; 1/3 -i/7], [4 2]), "[-0.3333+0i 0+0.14i;0.3333+0i -0-0.14i]")
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	137 %!assert (mat2str (int16 ([1 -1]), "class"), "int16([1 -1])")
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	138 %!assert (mat2str (true), "true")
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	139 %!assert (mat2str (false), "false")
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	140 %!assert (mat2str (logical (eye (2))), "[true false;false true]")
13180 c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	141
c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	142 %% Test input validation
c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	143 %!error mat2str ()
c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	144 %!error mat2str (1,2,3,4)
c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	145 %!error mat2str (["Hello"])
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14363 diff changeset	146 %!error <X must be two dimensional> mat2str (ones (3,3,2))
13180 c215352ddb4f mat2str.m: Use more modern code syntax for function Rik <octave@nomad.inbox5.com> parents: 12611 diff changeset	147

Mercurial > octave-antonio

annotate scripts/strings/mat2str.m @ 16994:333243133364