Mercurial > hg > octave-lyh
diff src/pt-mat.cc @ 14429:eff4a5933e28
Update %!tests in src/ directory with Octave coding conventions.
* data.cc, defaults.cc, dirfns.cc, file-io.cc, graphics.cc, mappers.cc,
oct-map.cc, octave.cc, ov-base.cc, ov-bool-mat.cc, ov-cell.cc,
ov-fcn-handle.cc, ov-fcn-inline.cc, ov-flt-re-mat.cc, ov-int16.cc, ov-int32.cc,
ov-int64.cc, ov-int8.cc, ov-null-mat.cc, ov-oncleanup.cc, ov-range.cc,
ov-re-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-uint16.cc, ov-uint32.cc,
ov-uint64.cc, ov-uint8.cc, ov.cc, pr-output.cc, pt-binop.cc, pt-eval.cc,
pt-idx.cc, pt-mat.cc, sighandlers.cc, strfns.cc, symtab.cc, syscalls.cc,
sysdep.cc, toplev.cc, utils.cc, variables.cc: Update %!tests in src/ directory
with Octave coding conventions.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Sun, 04 Mar 2012 12:21:10 -0800 |
| parents | cbcaf5602469 |
| children | b99cb1b0ee7c |
line wrap: on
line diff
--- a/src/pt-mat.cc +++ b/src/pt-mat.cc @@ -1193,198 +1193,198 @@ } /* -%% test concatenation with all zero matrices -%!assert([ '' 65*ones(1,10) ], 'AAAAAAAAAA'); -%!assert([ 65*ones(1,10) '' ], 'AAAAAAAAAA'); +## test concatenation with all zero matrices +%!assert ([ "" 65*ones(1,10) ], "AAAAAAAAAA"); +%!assert ([ 65*ones(1,10) "" ], "AAAAAAAAAA"); %!test -%! c = {'foo'; 'bar'; 'bazoloa'}; -%! assert ([c; 'a'; 'bc'; 'def'], {'foo'; 'bar'; 'bazoloa'; 'a'; 'bc'; 'def'}); +%! c = {"foo"; "bar"; "bazoloa"}; +%! assert ([c; "a"; "bc"; "def"], {"foo"; "bar"; "bazoloa"; "a"; "bc"; "def"}); -%!assert (class ([int64(1), int64(1)]), 'int64') -%!assert (class ([int64(1), int32(1)]), 'int64') -%!assert (class ([int64(1), int16(1)]), 'int64') -%!assert (class ([int64(1), int8(1)]), 'int64') -%!assert (class ([int64(1), uint64(1)]), 'int64') -%!assert (class ([int64(1), uint32(1)]), 'int64') -%!assert (class ([int64(1), uint16(1)]), 'int64') -%!assert (class ([int64(1), uint8(1)]), 'int64') -%!assert (class ([int64(1), single(1)]), 'int64') -%!assert (class ([int64(1), double(1)]), 'int64') -%!assert (class ([int64(1), cell(1)]), 'cell') -%!assert (class ([int64(1), true]), 'int64') -%!assert (class ([int64(1), 'a']), 'char') +%!assert (class ([int64(1), int64(1)]), "int64") +%!assert (class ([int64(1), int32(1)]), "int64") +%!assert (class ([int64(1), int16(1)]), "int64") +%!assert (class ([int64(1), int8(1)]), "int64") +%!assert (class ([int64(1), uint64(1)]), "int64") +%!assert (class ([int64(1), uint32(1)]), "int64") +%!assert (class ([int64(1), uint16(1)]), "int64") +%!assert (class ([int64(1), uint8(1)]), "int64") +%!assert (class ([int64(1), single(1)]), "int64") +%!assert (class ([int64(1), double(1)]), "int64") +%!assert (class ([int64(1), cell(1)]), "cell") +%!assert (class ([int64(1), true]), "int64") +%!assert (class ([int64(1), "a"]), "char") -%!assert (class ([int32(1), int64(1)]), 'int32') -%!assert (class ([int32(1), int32(1)]), 'int32') -%!assert (class ([int32(1), int16(1)]), 'int32') -%!assert (class ([int32(1), int8(1)]), 'int32') -%!assert (class ([int32(1), uint64(1)]), 'int32') -%!assert (class ([int32(1), uint32(1)]), 'int32') -%!assert (class ([int32(1), uint16(1)]), 'int32') -%!assert (class ([int32(1), uint8(1)]), 'int32') -%!assert (class ([int32(1), single(1)]), 'int32') -%!assert (class ([int32(1), double(1)]), 'int32') -%!assert (class ([int32(1), cell(1)]), 'cell') -%!assert (class ([int32(1), true]), 'int32') -%!assert (class ([int32(1), 'a']), 'char') +%!assert (class ([int32(1), int64(1)]), "int32") +%!assert (class ([int32(1), int32(1)]), "int32") +%!assert (class ([int32(1), int16(1)]), "int32") +%!assert (class ([int32(1), int8(1)]), "int32") +%!assert (class ([int32(1), uint64(1)]), "int32") +%!assert (class ([int32(1), uint32(1)]), "int32") +%!assert (class ([int32(1), uint16(1)]), "int32") +%!assert (class ([int32(1), uint8(1)]), "int32") +%!assert (class ([int32(1), single(1)]), "int32") +%!assert (class ([int32(1), double(1)]), "int32") +%!assert (class ([int32(1), cell(1)]), "cell") +%!assert (class ([int32(1), true]), "int32") +%!assert (class ([int32(1), "a"]), "char") -%!assert (class ([int16(1), int64(1)]), 'int16') -%!assert (class ([int16(1), int32(1)]), 'int16') -%!assert (class ([int16(1), int16(1)]), 'int16') -%!assert (class ([int16(1), int8(1)]), 'int16') -%!assert (class ([int16(1), uint64(1)]), 'int16') -%!assert (class ([int16(1), uint32(1)]), 'int16') -%!assert (class ([int16(1), uint16(1)]), 'int16') -%!assert (class ([int16(1), uint8(1)]), 'int16') -%!assert (class ([int16(1), single(1)]), 'int16') -%!assert (class ([int16(1), double(1)]), 'int16') -%!assert (class ([int16(1), cell(1)]), 'cell') -%!assert (class ([int16(1), true]), 'int16') -%!assert (class ([int16(1), 'a']), 'char') +%!assert (class ([int16(1), int64(1)]), "int16") +%!assert (class ([int16(1), int32(1)]), "int16") +%!assert (class ([int16(1), int16(1)]), "int16") +%!assert (class ([int16(1), int8(1)]), "int16") +%!assert (class ([int16(1), uint64(1)]), "int16") +%!assert (class ([int16(1), uint32(1)]), "int16") +%!assert (class ([int16(1), uint16(1)]), "int16") +%!assert (class ([int16(1), uint8(1)]), "int16") +%!assert (class ([int16(1), single(1)]), "int16") +%!assert (class ([int16(1), double(1)]), "int16") +%!assert (class ([int16(1), cell(1)]), "cell") +%!assert (class ([int16(1), true]), "int16") +%!assert (class ([int16(1), "a"]), "char") -%!assert (class ([int8(1), int64(1)]), 'int8') -%!assert (class ([int8(1), int32(1)]), 'int8') -%!assert (class ([int8(1), int16(1)]), 'int8') -%!assert (class ([int8(1), int8(1)]), 'int8') -%!assert (class ([int8(1), uint64(1)]), 'int8') -%!assert (class ([int8(1), uint32(1)]), 'int8') -%!assert (class ([int8(1), uint16(1)]), 'int8') -%!assert (class ([int8(1), uint8(1)]), 'int8') -%!assert (class ([int8(1), single(1)]), 'int8') -%!assert (class ([int8(1), double(1)]), 'int8') -%!assert (class ([int8(1), cell(1)]), 'cell') -%!assert (class ([int8(1), true]), 'int8') -%!assert (class ([int8(1), 'a']), 'char') +%!assert (class ([int8(1), int64(1)]), "int8") +%!assert (class ([int8(1), int32(1)]), "int8") +%!assert (class ([int8(1), int16(1)]), "int8") +%!assert (class ([int8(1), int8(1)]), "int8") +%!assert (class ([int8(1), uint64(1)]), "int8") +%!assert (class ([int8(1), uint32(1)]), "int8") +%!assert (class ([int8(1), uint16(1)]), "int8") +%!assert (class ([int8(1), uint8(1)]), "int8") +%!assert (class ([int8(1), single(1)]), "int8") +%!assert (class ([int8(1), double(1)]), "int8") +%!assert (class ([int8(1), cell(1)]), "cell") +%!assert (class ([int8(1), true]), "int8") +%!assert (class ([int8(1), "a"]), "char") -%!assert (class ([uint64(1), int64(1)]), 'uint64') -%!assert (class ([uint64(1), int32(1)]), 'uint64') -%!assert (class ([uint64(1), int16(1)]), 'uint64') -%!assert (class ([uint64(1), int8(1)]), 'uint64') -%!assert (class ([uint64(1), uint64(1)]), 'uint64') -%!assert (class ([uint64(1), uint32(1)]), 'uint64') -%!assert (class ([uint64(1), uint16(1)]), 'uint64') -%!assert (class ([uint64(1), uint8(1)]), 'uint64') -%!assert (class ([uint64(1), single(1)]), 'uint64') -%!assert (class ([uint64(1), double(1)]), 'uint64') -%!assert (class ([uint64(1), cell(1)]), 'cell') -%!assert (class ([uint64(1), true]), 'uint64') -%!assert (class ([uint64(1), 'a']), 'char') +%!assert (class ([uint64(1), int64(1)]), "uint64") +%!assert (class ([uint64(1), int32(1)]), "uint64") +%!assert (class ([uint64(1), int16(1)]), "uint64") +%!assert (class ([uint64(1), int8(1)]), "uint64") +%!assert (class ([uint64(1), uint64(1)]), "uint64") +%!assert (class ([uint64(1), uint32(1)]), "uint64") +%!assert (class ([uint64(1), uint16(1)]), "uint64") +%!assert (class ([uint64(1), uint8(1)]), "uint64") +%!assert (class ([uint64(1), single(1)]), "uint64") +%!assert (class ([uint64(1), double(1)]), "uint64") +%!assert (class ([uint64(1), cell(1)]), "cell") +%!assert (class ([uint64(1), true]), "uint64") +%!assert (class ([uint64(1), "a"]), "char") -%!assert (class ([uint32(1), int64(1)]), 'uint32') -%!assert (class ([uint32(1), int32(1)]), 'uint32') -%!assert (class ([uint32(1), int16(1)]), 'uint32') -%!assert (class ([uint32(1), int8(1)]), 'uint32') -%!assert (class ([uint32(1), uint64(1)]), 'uint32') -%!assert (class ([uint32(1), uint32(1)]), 'uint32') -%!assert (class ([uint32(1), uint16(1)]), 'uint32') -%!assert (class ([uint32(1), uint8(1)]), 'uint32') -%!assert (class ([uint32(1), single(1)]), 'uint32') -%!assert (class ([uint32(1), double(1)]), 'uint32') -%!assert (class ([uint32(1), cell(1)]), 'cell') -%!assert (class ([uint32(1), true]), 'uint32') -%!assert (class ([uint32(1), 'a']), 'char') +%!assert (class ([uint32(1), int64(1)]), "uint32") +%!assert (class ([uint32(1), int32(1)]), "uint32") +%!assert (class ([uint32(1), int16(1)]), "uint32") +%!assert (class ([uint32(1), int8(1)]), "uint32") +%!assert (class ([uint32(1), uint64(1)]), "uint32") +%!assert (class ([uint32(1), uint32(1)]), "uint32") +%!assert (class ([uint32(1), uint16(1)]), "uint32") +%!assert (class ([uint32(1), uint8(1)]), "uint32") +%!assert (class ([uint32(1), single(1)]), "uint32") +%!assert (class ([uint32(1), double(1)]), "uint32") +%!assert (class ([uint32(1), cell(1)]), "cell") +%!assert (class ([uint32(1), true]), "uint32") +%!assert (class ([uint32(1), "a"]), "char") -%!assert (class ([uint16(1), int64(1)]), 'uint16') -%!assert (class ([uint16(1), int32(1)]), 'uint16') -%!assert (class ([uint16(1), int16(1)]), 'uint16') -%!assert (class ([uint16(1), int8(1)]), 'uint16') -%!assert (class ([uint16(1), uint64(1)]), 'uint16') -%!assert (class ([uint16(1), uint32(1)]), 'uint16') -%!assert (class ([uint16(1), uint16(1)]), 'uint16') -%!assert (class ([uint16(1), uint8(1)]), 'uint16') -%!assert (class ([uint16(1), single(1)]), 'uint16') -%!assert (class ([uint16(1), double(1)]), 'uint16') -%!assert (class ([uint16(1), cell(1)]), 'cell') -%!assert (class ([uint16(1), true]), 'uint16') -%!assert (class ([uint16(1), 'a']), 'char') +%!assert (class ([uint16(1), int64(1)]), "uint16") +%!assert (class ([uint16(1), int32(1)]), "uint16") +%!assert (class ([uint16(1), int16(1)]), "uint16") +%!assert (class ([uint16(1), int8(1)]), "uint16") +%!assert (class ([uint16(1), uint64(1)]), "uint16") +%!assert (class ([uint16(1), uint32(1)]), "uint16") +%!assert (class ([uint16(1), uint16(1)]), "uint16") +%!assert (class ([uint16(1), uint8(1)]), "uint16") +%!assert (class ([uint16(1), single(1)]), "uint16") +%!assert (class ([uint16(1), double(1)]), "uint16") +%!assert (class ([uint16(1), cell(1)]), "cell") +%!assert (class ([uint16(1), true]), "uint16") +%!assert (class ([uint16(1), "a"]), "char") -%!assert (class ([uint8(1), int64(1)]), 'uint8') -%!assert (class ([uint8(1), int32(1)]), 'uint8') -%!assert (class ([uint8(1), int16(1)]), 'uint8') -%!assert (class ([uint8(1), int8(1)]), 'uint8') -%!assert (class ([uint8(1), uint64(1)]), 'uint8') -%!assert (class ([uint8(1), uint32(1)]), 'uint8') -%!assert (class ([uint8(1), uint16(1)]), 'uint8') -%!assert (class ([uint8(1), uint8(1)]), 'uint8') -%!assert (class ([uint8(1), single(1)]), 'uint8') -%!assert (class ([uint8(1), double(1)]), 'uint8') -%!assert (class ([uint8(1), cell(1)]), 'cell') -%!assert (class ([uint8(1), true]), 'uint8') -%!assert (class ([uint8(1), 'a']), 'char') +%!assert (class ([uint8(1), int64(1)]), "uint8") +%!assert (class ([uint8(1), int32(1)]), "uint8") +%!assert (class ([uint8(1), int16(1)]), "uint8") +%!assert (class ([uint8(1), int8(1)]), "uint8") +%!assert (class ([uint8(1), uint64(1)]), "uint8") +%!assert (class ([uint8(1), uint32(1)]), "uint8") +%!assert (class ([uint8(1), uint16(1)]), "uint8") +%!assert (class ([uint8(1), uint8(1)]), "uint8") +%!assert (class ([uint8(1), single(1)]), "uint8") +%!assert (class ([uint8(1), double(1)]), "uint8") +%!assert (class ([uint8(1), cell(1)]), "cell") +%!assert (class ([uint8(1), true]), "uint8") +%!assert (class ([uint8(1), "a"]), "char") -%!assert (class ([single(1), int64(1)]), 'int64') -%!assert (class ([single(1), int32(1)]), 'int32') -%!assert (class ([single(1), int16(1)]), 'int16') -%!assert (class ([single(1), int8(1)]), 'int8') -%!assert (class ([single(1), uint64(1)]), 'uint64') -%!assert (class ([single(1), uint32(1)]), 'uint32') -%!assert (class ([single(1), uint16(1)]), 'uint16') -%!assert (class ([single(1), uint8(1)]), 'uint8') -%!assert (class ([single(1), single(1)]), 'single') -%!assert (class ([single(1), double(1)]), 'single') -%!assert (class ([single(1), cell(1)]), 'cell') -%!assert (class ([single(1), true]), 'single') -%!assert (class ([single(1), 'a']), 'char') +%!assert (class ([single(1), int64(1)]), "int64") +%!assert (class ([single(1), int32(1)]), "int32") +%!assert (class ([single(1), int16(1)]), "int16") +%!assert (class ([single(1), int8(1)]), "int8") +%!assert (class ([single(1), uint64(1)]), "uint64") +%!assert (class ([single(1), uint32(1)]), "uint32") +%!assert (class ([single(1), uint16(1)]), "uint16") +%!assert (class ([single(1), uint8(1)]), "uint8") +%!assert (class ([single(1), single(1)]), "single") +%!assert (class ([single(1), double(1)]), "single") +%!assert (class ([single(1), cell(1)]), "cell") +%!assert (class ([single(1), true]), "single") +%!assert (class ([single(1), "a"]), "char") -%!assert (class ([double(1), int64(1)]), 'int64') -%!assert (class ([double(1), int32(1)]), 'int32') -%!assert (class ([double(1), int16(1)]), 'int16') -%!assert (class ([double(1), int8(1)]), 'int8') -%!assert (class ([double(1), uint64(1)]), 'uint64') -%!assert (class ([double(1), uint32(1)]), 'uint32') -%!assert (class ([double(1), uint16(1)]), 'uint16') -%!assert (class ([double(1), uint8(1)]), 'uint8') -%!assert (class ([double(1), single(1)]), 'single') -%!assert (class ([double(1), double(1)]), 'double') -%!assert (class ([double(1), cell(1)]), 'cell') -%!assert (class ([double(1), true]), 'double') -%!assert (class ([double(1), 'a']), 'char') +%!assert (class ([double(1), int64(1)]), "int64") +%!assert (class ([double(1), int32(1)]), "int32") +%!assert (class ([double(1), int16(1)]), "int16") +%!assert (class ([double(1), int8(1)]), "int8") +%!assert (class ([double(1), uint64(1)]), "uint64") +%!assert (class ([double(1), uint32(1)]), "uint32") +%!assert (class ([double(1), uint16(1)]), "uint16") +%!assert (class ([double(1), uint8(1)]), "uint8") +%!assert (class ([double(1), single(1)]), "single") +%!assert (class ([double(1), double(1)]), "double") +%!assert (class ([double(1), cell(1)]), "cell") +%!assert (class ([double(1), true]), "double") +%!assert (class ([double(1), "a"]), "char") -%!assert (class ([cell(1), int64(1)]), 'cell') -%!assert (class ([cell(1), int32(1)]), 'cell') -%!assert (class ([cell(1), int16(1)]), 'cell') -%!assert (class ([cell(1), int8(1)]), 'cell') -%!assert (class ([cell(1), uint64(1)]), 'cell') -%!assert (class ([cell(1), uint32(1)]), 'cell') -%!assert (class ([cell(1), uint16(1)]), 'cell') -%!assert (class ([cell(1), uint8(1)]), 'cell') -%!assert (class ([cell(1), single(1)]), 'cell') -%!assert (class ([cell(1), double(1)]), 'cell') -%!assert (class ([cell(1), cell(1)]), 'cell') -%!assert (class ([cell(1), true]), 'cell') -%!assert (class ([cell(1), 'a']), 'cell') +%!assert (class ([cell(1), int64(1)]), "cell") +%!assert (class ([cell(1), int32(1)]), "cell") +%!assert (class ([cell(1), int16(1)]), "cell") +%!assert (class ([cell(1), int8(1)]), "cell") +%!assert (class ([cell(1), uint64(1)]), "cell") +%!assert (class ([cell(1), uint32(1)]), "cell") +%!assert (class ([cell(1), uint16(1)]), "cell") +%!assert (class ([cell(1), uint8(1)]), "cell") +%!assert (class ([cell(1), single(1)]), "cell") +%!assert (class ([cell(1), double(1)]), "cell") +%!assert (class ([cell(1), cell(1)]), "cell") +%!assert (class ([cell(1), true]), "cell") +%!assert (class ([cell(1), "a"]), "cell") -%!assert (class ([true, int64(1)]), 'int64') -%!assert (class ([true, int32(1)]), 'int32') -%!assert (class ([true, int16(1)]), 'int16') -%!assert (class ([true, int8(1)]), 'int8') -%!assert (class ([true, uint64(1)]), 'uint64') -%!assert (class ([true, uint32(1)]), 'uint32') -%!assert (class ([true, uint16(1)]), 'uint16') -%!assert (class ([true, uint8(1)]), 'uint8') -%!assert (class ([true, single(1)]), 'single') -%!assert (class ([true, double(1)]), 'double') -%!assert (class ([true, cell(1)]), 'cell') -%!assert (class ([true, true]), 'logical') -%!assert (class ([true, 'a']), 'char') +%!assert (class ([true, int64(1)]), "int64") +%!assert (class ([true, int32(1)]), "int32") +%!assert (class ([true, int16(1)]), "int16") +%!assert (class ([true, int8(1)]), "int8") +%!assert (class ([true, uint64(1)]), "uint64") +%!assert (class ([true, uint32(1)]), "uint32") +%!assert (class ([true, uint16(1)]), "uint16") +%!assert (class ([true, uint8(1)]), "uint8") +%!assert (class ([true, single(1)]), "single") +%!assert (class ([true, double(1)]), "double") +%!assert (class ([true, cell(1)]), "cell") +%!assert (class ([true, true]), "logical") +%!assert (class ([true, "a"]), "char") -%!assert (class (['a', int64(1)]), 'char') -%!assert (class (['a', int32(1)]), 'char') -%!assert (class (['a', int16(1)]), 'char') -%!assert (class (['a', int8(1)]), 'char') -%!assert (class (['a', int64(1)]), 'char') -%!assert (class (['a', int32(1)]), 'char') -%!assert (class (['a', int16(1)]), 'char') -%!assert (class (['a', int8(1)]), 'char') -%!assert (class (['a', single(1)]), 'char') -%!assert (class (['a', double(1)]), 'char') -%!assert (class (['a', cell(1)]), 'cell') -%!assert (class (['a', true]), 'char') -%!assert (class (['a', 'a']), 'char') +%!assert (class (["a", int64(1)]), "char") +%!assert (class (["a", int32(1)]), "char") +%!assert (class (["a", int16(1)]), "char") +%!assert (class (["a", int8(1)]), "char") +%!assert (class (["a", int64(1)]), "char") +%!assert (class (["a", int32(1)]), "char") +%!assert (class (["a", int16(1)]), "char") +%!assert (class (["a", int8(1)]), "char") +%!assert (class (["a", single(1)]), "char") +%!assert (class (["a", double(1)]), "char") +%!assert (class (["a", cell(1)]), "cell") +%!assert (class (["a", true]), "char") +%!assert (class (["a", "a"]), "char") -%!assert (class ([cell(1), struct('foo', 'bar')]), 'cell') -%!error [struct('foo', 'bar'), cell(1)]; +%!assert (class ([cell(1), struct("foo", "bar")]), "cell") +%!error [struct("foo", "bar"), cell(1)] */ DEFUN (string_fill_char, args, nargout, @@ -1415,9 +1415,8 @@ } /* -%!error (string_fill_char (1, 2)); -%% string_fill_char() function call must be outside of %!test block -%% due to the way a %!test block is wrapped inside a function +## string_fill_char() function call must be outside of %!test block +## due to the way a %!test block is wrapped inside a function %!shared orig_val, old_val %! orig_val = string_fill_char (); %! old_val = string_fill_char ("X"); @@ -1427,4 +1426,6 @@ %! assert (["these"; "are"; "strings"], ["theseXX"; "areXXXX"; "strings"]); %! string_fill_char (orig_val); %! assert (string_fill_char (), orig_val); + +%!error (string_fill_char (1, 2)) */