Mercurial > octave-nkf

changeset 20653:9cef0a1207e4 @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cell2mat: add tests for cells of cells and char arrays
author Carnë Draug <carandraug@octave.org>
date Tue, 13 Oct 2015 11:40:05 +0100
parents a3b9ee5c040a
children b65888ec820e
files scripts/general/cell2mat.m
diffstat 1 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/general/cell2mat.m	Mon Oct 12 21:28:32 2015 -0700
+++ b/scripts/general/cell2mat.m	Tue Oct 13 11:40:05 2015 +0100
@@ -114,10 +114,22 @@
 %! m = {1, 2, 3};
 %! assert (cell2mat (mat2cell (m, 1, [1 1 1])), m);
 
+## cell2mat from cell into another cell
+%!assert (cell2mat ({{"foo", "bar", "qux"}}), {"foo", "bar", "qux"})
+%!assert (cell2mat ({{"foo"}, {"bar", "qux"}}), {"foo", "bar", "qux"})
+%!assert (cell2mat ({{"foo"}; {"bar"; "qux"}}), {"foo"; "bar"; "qux"})
+%!assert (cell2mat ({{"foo", "lol"}; {"bar", "qux"}}),
+%!        {"foo", "lol"; "bar", "qux"})
+
+## cell2mat cell strings
+%!assert (cell2mat ({"foo", "lol"; "bar", "qux"}),
+%!        reshape ("fboaorlqoulx", [2 6]))
+
 %!error cell2mat ()
 %!error cell2mat (1,2)
 %!error <C must be a cell array> cell2mat ([1,2])
 %!error <mixed cells, structs, and matrices> cell2mat ({[1], struct()})
 %!error <mixed cells, structs, and matrices> cell2mat ({[1], {1}})
 %!error <mixed cells, structs, and matrices> cell2mat ({struct(), {1}})
-
+%!error <dimension mismatch> cell2mat ({{"foo"}; {"bar", "qux"}})
+%!error <dimension mismatch> cell2mat ({"foox", "lol"; "bar", "qux"})