Mercurial > octave-antonio
annotate scripts/strings/mat2str.m @ 17281:bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Macro handles options ("on") or properties ("position") more elegantly
than @code{"text"}.
* doc/interpreter/macros.texi: Add new @qcode macro.
* doc/interpreter/tips.txi: Add documentation about @qcode macro.
* doc/interpreter/basics.txi, doc/interpreter/container.txi,
doc/interpreter/emacs.txi, doc/interpreter/errors.txi,
doc/interpreter/eval.txi, doc/interpreter/expr.txi,
doc/interpreter/external.txi, doc/interpreter/func.txi,
doc/interpreter/grammar.txi, doc/interpreter/image.txi,
doc/interpreter/install.txi, doc/interpreter/interp.txi,
doc/interpreter/io.txi, doc/interpreter/matrix.txi,
doc/interpreter/numbers.txi, doc/interpreter/oop.txi,
doc/interpreter/package.txi, doc/interpreter/plot.txi,
doc/interpreter/quad.txi, doc/interpreter/sparse.txi,
doc/interpreter/strings.txi, doc/interpreter/system.txi,
doc/interpreter/vectorize.txi, libinterp/corefcn/balance.cc,
libinterp/corefcn/bitfcns.cc, libinterp/corefcn/cellfun.cc,
libinterp/corefcn/conv2.cc, libinterp/corefcn/data.cc,
libinterp/corefcn/debug.cc, libinterp/corefcn/defaults.cc,
libinterp/corefcn/dirfns.cc, libinterp/corefcn/dlmread.cc,
libinterp/corefcn/error.cc, libinterp/corefcn/file-io.cc,
libinterp/corefcn/find.cc, libinterp/corefcn/gammainc.cc,
libinterp/corefcn/graphics.cc, libinterp/corefcn/help.cc,
libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc,
libinterp/corefcn/load-path.cc, libinterp/corefcn/load-save.cc,
libinterp/corefcn/ls-oct-ascii.cc, libinterp/corefcn/lu.cc,
libinterp/corefcn/luinc.cc, libinterp/corefcn/matrix_type.cc,
libinterp/corefcn/oct-hist.cc, libinterp/corefcn/pager.cc,
libinterp/corefcn/pr-output.cc, libinterp/corefcn/pt-jit.cc,
libinterp/corefcn/qz.cc, libinterp/corefcn/rand.cc,
libinterp/corefcn/regexp.cc, libinterp/corefcn/schur.cc,
libinterp/corefcn/sighandlers.cc, libinterp/corefcn/sparse.cc,
libinterp/corefcn/spparms.cc, libinterp/corefcn/str2double.cc,
libinterp/corefcn/svd.cc, libinterp/corefcn/symtab.cc,
libinterp/corefcn/syscalls.cc, libinterp/corefcn/toplev.cc,
libinterp/corefcn/tril.cc, libinterp/corefcn/typecast.cc,
libinterp/corefcn/utils.cc, libinterp/corefcn/variables.cc,
libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/chol.cc,
libinterp/dldfcn/colamd.cc, libinterp/dldfcn/fftw.cc, libinterp/dldfcn/qr.cc,
libinterp/dldfcn/symbfact.cc, libinterp/octave-value/ov-base.cc,
libinterp/octave-value/ov-fcn-handle.cc,
libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-java.cc,
libinterp/octave-value/ov-range.cc, libinterp/octave-value/ov-struct.cc,
libinterp/octave-value/ov-usr-fcn.cc, libinterp/parse-tree/oct-parse.in.yy,
libinterp/parse-tree/pt-binop.cc, libinterp/parse-tree/pt-eval.cc,
libinterp/parse-tree/pt-mat.cc, scripts/@ftp/ftp.m,
scripts/deprecated/java_convert_matrix.m, scripts/deprecated/java_debug.m,
scripts/deprecated/java_unsigned_conversion.m, scripts/deprecated/shell_cmd.m,
scripts/general/dblquad.m, scripts/general/display.m,
scripts/general/genvarname.m, scripts/general/idivide.m,
scripts/general/interp1.m, scripts/general/interp2.m,
scripts/general/interp3.m, scripts/general/interpn.m, scripts/general/isa.m,
scripts/general/profexplore.m, scripts/general/profile.m,
scripts/general/quadgk.m, scripts/general/randi.m, scripts/general/structfun.m,
scripts/general/subsindex.m, scripts/general/triplequad.m,
scripts/geometry/griddata.m, scripts/geometry/griddata3.m,
scripts/geometry/griddatan.m, scripts/geometry/voronoi.m, scripts/help/help.m,
scripts/help/lookfor.m, scripts/image/cmpermute.m, scripts/image/colormap.m,
scripts/image/image.m, scripts/image/imagesc.m, scripts/image/imfinfo.m,
scripts/image/imformats.m, scripts/image/imread.m, scripts/image/imshow.m,
scripts/image/imwrite.m, scripts/image/ind2gray.m, scripts/image/lines.m,
scripts/image/rgb2ind.m, scripts/image/spinmap.m, scripts/io/dlmwrite.m,
scripts/io/strread.m, scripts/io/textread.m, scripts/io/textscan.m,
scripts/java/javaclasspath.m, scripts/java/usejava.m,
scripts/miscellaneous/bzip2.m, scripts/miscellaneous/computer.m,
scripts/miscellaneous/copyfile.m, scripts/miscellaneous/debug.m,
scripts/miscellaneous/dos.m, scripts/miscellaneous/edit.m,
scripts/miscellaneous/gzip.m, scripts/miscellaneous/license.m,
scripts/miscellaneous/mkoctfile.m, scripts/miscellaneous/movefile.m,
scripts/miscellaneous/parseparams.m, scripts/miscellaneous/unix.m,
scripts/optimization/fminbnd.m, scripts/optimization/fminsearch.m,
scripts/optimization/fminunc.m, scripts/optimization/fsolve.m,
scripts/optimization/fzero.m, scripts/optimization/glpk.m,
scripts/optimization/lsqnonneg.m, scripts/optimization/optimset.m,
scripts/optimization/pqpnonneg.m, scripts/pkg/pkg.m, scripts/plot/allchild.m,
scripts/plot/ancestor.m, scripts/plot/area.m, scripts/plot/axis.m,
scripts/plot/bar.m, scripts/plot/barh.m, scripts/plot/box.m,
scripts/plot/caxis.m, scripts/plot/cla.m, scripts/plot/clabel.m,
scripts/plot/clf.m, scripts/plot/close.m, scripts/plot/colorbar.m,
scripts/plot/daspect.m, scripts/plot/ezmesh.m, scripts/plot/ezmeshc.m,
scripts/plot/ezsurf.m, scripts/plot/ezsurfc.m, scripts/plot/findall.m,
scripts/plot/findobj.m, scripts/plot/gcbo.m, scripts/plot/gcf.m,
scripts/plot/gco.m, scripts/plot/grid.m, scripts/plot/guihandles.m,
scripts/plot/hdl2struct.m, scripts/plot/hidden.m, scripts/plot/hold.m,
scripts/plot/isonormals.m, scripts/plot/isosurface.m, scripts/plot/legend.m,
scripts/plot/mesh.m, scripts/plot/meshc.m, scripts/plot/meshz.m,
scripts/plot/newplot.m, scripts/plot/orient.m, scripts/plot/pareto.m,
scripts/plot/patch.m, scripts/plot/pbaspect.m, scripts/plot/pcolor.m,
scripts/plot/plot.m, scripts/plot/print.m,
scripts/plot/private/__add_default_menu__.m, scripts/plot/quiver.m,
scripts/plot/quiver3.m, scripts/plot/refreshdata.m, scripts/plot/saveas.m,
scripts/plot/scatter.m, scripts/plot/scatter3.m, scripts/plot/shading.m,
scripts/plot/shrinkfaces.m, scripts/plot/slice.m, scripts/plot/stem.m,
scripts/plot/stem3.m, scripts/plot/struct2hdl.m, scripts/plot/subplot.m,
scripts/plot/surf.m, scripts/plot/surfc.m, scripts/plot/surfl.m,
scripts/plot/tetramesh.m, scripts/plot/uigetfile.m, scripts/plot/uimenu.m,
scripts/plot/uiputfile.m, scripts/plot/waterfall.m, scripts/plot/whitebg.m,
scripts/plot/xlim.m, scripts/plot/ylim.m, scripts/plot/zlim.m,
scripts/polynomial/conv.m, scripts/polynomial/polyout.m,
scripts/polynomial/splinefit.m, scripts/set/ismember.m, scripts/set/powerset.m,
scripts/set/setdiff.m, scripts/set/union.m, scripts/set/unique.m,
scripts/signal/detrend.m, scripts/signal/filter2.m, scripts/signal/freqz.m,
scripts/signal/periodogram.m, scripts/signal/spectral_adf.m,
scripts/signal/spectral_xdf.m, scripts/sparse/eigs.m, scripts/sparse/svds.m,
scripts/specfun/legendre.m, scripts/special-matrix/gallery.m,
scripts/statistics/base/mean.m, scripts/statistics/base/moment.m,
scripts/statistics/tests/cor_test.m,
scripts/statistics/tests/kolmogorov_smirnov_test.m,
scripts/statistics/tests/kolmogorov_smirnov_test_2.m,
scripts/statistics/tests/kruskal_wallis_test.m,
scripts/statistics/tests/prop_test_2.m, scripts/statistics/tests/sign_test.m,
scripts/statistics/tests/t_test.m, scripts/statistics/tests/t_test_2.m,
scripts/statistics/tests/t_test_regression.m,
scripts/statistics/tests/u_test.m, scripts/statistics/tests/var_test.m,
scripts/statistics/tests/welch_test.m,
scripts/statistics/tests/wilcoxon_test.m, scripts/statistics/tests/z_test.m,
scripts/statistics/tests/z_test_2.m, scripts/strings/base2dec.m,
scripts/strings/index.m, scripts/strings/isstrprop.m,
scripts/strings/mat2str.m, scripts/strings/regexptranslate.m,
scripts/strings/rindex.m, scripts/strings/str2num.m, scripts/strings/strcat.m,
scripts/strings/strjust.m, scripts/strings/strmatch.m,
scripts/strings/validatestring.m, scripts/testfun/demo.m,
scripts/testfun/example.m, scripts/testfun/test.m, scripts/time/addtodate.m,
scripts/time/asctime.m, scripts/time/datestr.m, scripts/time/datetick.m,
scripts/time/weekday.m, scripts/ui/errordlg.m, scripts/ui/helpdlg.m,
scripts/ui/inputdlg.m, scripts/ui/listdlg.m, scripts/ui/msgbox.m,
scripts/ui/questdlg.m, scripts/ui/warndlg.m: Use new @qcode macro.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 19 Aug 2013 20:46:38 -0700 |
| parents | 333243133364 |
| children | d63878346099 |
| 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 | 2 ## |
| 3 ## This file is part of Octave. | |
| 4 ## | |
| 5 ## Octave is free software; you can redistribute it and/or modify it | |
| 6 ## under the terms of the GNU General Public License as published by | |
| 7016 | 7 ## the Free Software Foundation; either version 3 of the License, or (at |
| 8 ## your option) any later version. | |
| 5837 | 9 ## |
| 10 ## Octave is distributed in the hope that it will be useful, but | |
| 11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 ## General Public License for more details. | |
| 14 ## | |
| 15 ## You should have received a copy of the GNU General Public License | |
| 7016 | 16 ## along with Octave; see the file COPYING. If not, see |
| 17 ## <http://www.gnu.org/licenses/>. | |
| 5837 | 18 |
| 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 | 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 | 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 | 31 ## |
|
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
16994
diff
changeset
|
32 ## If the argument @qcode{"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 | 34 ## construction of a matrix of the same class. |
| 35 ## | |
| 36 ## @example | |
| 37 ## @group | |
| 8507 | 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 | 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 | 52 ## @end group |
| 53 ## @end example | |
| 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 | 56 ## @end deftypefn |
| 57 | |
| 7016 | 58 ## Author: Rolf Fabian <fabian@tu-cottbus.de> |
| 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 | 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 | 73 endif |
| 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 | 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 | 80 n = [n, n]; |
| 81 endif | |
| 5838 | 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 | 88 endif |
| 89 | |
| 5838 | 90 nel = numel (x); |
| 5837 | 91 |
| 5838 | 92 if (nel == 0) |
| 93 ## Empty, only print brackets | |
| 5837 | 94 s = "[]"; |
| 5838 | 95 elseif (nel == 1) |
| 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 | 102 s = sprintf (fmt, x); |
| 5837 | 103 endif |
| 5838 | 104 else |
| 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 | 115 endif |
| 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 | 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 | 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 | 122 endif |
| 123 | |
| 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 | 126 endif |
|
13180
c215352ddb4f
mat2str.m: Use more modern code syntax for function
Rik <octave@nomad.inbox5.com>
parents:
12611
diff
changeset
|
127 |
| 5837 | 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 |