* Bug 16551 fixed: num2cell(['' '']) returned {}

  http://bugzilla.scilab.org/16551

Change-Id: I962f6e29bbfc1e8fbd61decb94b29a5851aa9818

diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index 61e546b..7dc950f 100644 (file)
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -330,6 +330,7 @@ Bug Fixes
 * [#16522](https://bugzilla.scilab.org/16522): `bitget(x,pos)` and `bitset(x,pos)` results could be wrong when `pos` is an encoded integer.
 * [#16525](https://bugzilla.scilab.org/16525): `soundsec(t,freq)` has the trivial equivalence `0 : 1/freq : t*(1-%eps)` and should be removed.
 * [#16549](https://bugzilla.scilab.org/16549): simple script crashed Scilab in GUI mode.
+* [#16551](https://bugzilla.scilab.org/16551): `num2cell` returned {} for any input array of empty strings.
 
 
 ### Bugs fixed in 6.1.0:

diff --git a/scilab/modules/data_structures/macros/num2cell.sci b/scilab/modules/data_structures/macros/num2cell.sci
index 0c87599..7d89b38 100644 (file)
--- a/scilab/modules/data_structures/macros/num2cell.sci
+++ b/scilab/modules/data_structures/macros/num2cell.sci
@@ -10,44 +10,40 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
-function  y=num2cell(x,dimens)
+function  y = num2cell(x, dimens)
     //
-    // NUM2CELL function converts an array of double or string or boolean into a cell array
-    // if there is just one input argument x, then it returns a cell which has the same size and the same components than x.
-    // if there are two input arguments x and dimens, y is obtained after reduction to 1 of the x dimensions sizes contained in the vector dimens.
-    // The dimensions sizes of components of y (i.e y{i}) are equal to the dimensions sizes of x whose the numbers are in dimens vector
-    // if size(x)=[2 3 4 5 6] and dimens=[2 4] -> size(y)=[2 1 4 1 6] , the sizes of the second (=dimens(1)) and the fourth (=dimens(2)) dimensions of x are reduced to 1 to obtain y. And size(y(i))=[1,3,1,5,1], the sizes of the second (=dimens(1)) and the fourth (=dimens(2)) dimensions of y(i) are equal to the sizes of the second and the fourth dimensions of x (i.e 3 and 5), the others dimensions are equal to 1
-    //
-    // Output
-    // -y : a cell
-    // Input
-    // -x : a numeric array
-    // -dimens : a scalar or a vector of positive integers. It contains the numbers of dimensions of x to reduce
-    // F.B
+    // x : regular array to be converted into a cells one.
+    // dimens : vector of integers > 0: indices of dimensions along
+    //          which the cells array must be concatenated.
+    // y : cells vector or array
 
+    rhs = argn(2)
+    // check the number of input arguments
+    if rhs < 1 | rhs > 2 then
+        error(msprintf(gettext("%s: Wrong number of input arguments: %d or %d expected.\n"), "num2cell", 1, 2))
+    end
     // case : x is empty, returns an empty cell
-    if isempty(x) then
-        y=cell()
+    xsize = size(x)
+    if prod(xsize)==0 then
+        y = cell()
         return
     end
-    xsize=size(x)
-    // check the number of input arguments
-    if argn(2)<1 then
-        error(msprintf(gettext("%s: Wrong number of input arguments: At least %d expected.\n"),"num2cell",1));
-    elseif argn(2)==1 then
-        for i=1:size(x,"*")
-            y{i}=x(i)
+
+    if argn(2)==1 then
+        for i = 1:size(x,"*")
+            y{i} = x(i)
         end
-        y=matrix(y,xsize)
+        y = matrix(y, xsize)
         return
-        // check the second input argument is a scalar (or a vector) of positive integers
-    else
-        if type(dimens)<>1 | or(dimens<=0) | or(dimens-floor(dimens)<>0) | ndims(dimens)>2 then
-            error(msprintf(gettext("%s: Wrong argument #%d: Positive integer expected.\n"),"num2cell",2));
-        end
-        dimens=matrix(dimens,1,-1)
     end
 
+    // check the second input argument is a scalar (or a vector) of
+    // positive integers
+    if type(dimens)<>1 | or(dimens<=0) | or(dimens-floor(dimens)<>0)  then
+        error(msprintf(gettext("%s: Wrong argument #%d: Positive integer expected.\n"),"num2cell",2));
+    end
+    dimens = matrix(dimens,1,-1)
+
 
     // xdimens : vector which contains the sizes of x dimensions which are in the vectordimens
     // nxdimens : vector which contains the sizes of x dimensions which are not in the vector dimens

diff --git a/scilab/modules/data_structures/tests/unit_tests/num2cell.tst b/scilab/modules/data_structures/tests/unit_tests/num2cell.tst
new file mode 100644 (file)
index 0000000..5c2117b
--- /dev/null
+++ b/scilab/modules/data_structures/tests/unit_tests/num2cell.tst
@@ -0,0 +1,54 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2020 - Samuel GOUGEON
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- CLI SHELL MODE -->
+// <-- NO CHECK REF -->
+
+// unit tests for num2cell()
+// -----------------------------------------------------------------------------
+
+assert_checkequal(num2cell([]), {});
+
+// -------------------
+// For decimal numbers
+// -------------------
+assert_checkequal(num2cell(1:4), {1,2,3,4});
+assert_checkequal(num2cell((1:4)'), {1,2,3,4}');
+assert_checkequal(num2cell([1 2 ; 3 4]), {1, 2 ; 3, 4});
+h = matrix(1:8,2,2,2);
+assert_checkequal(num2cell(h), cat(3,{1,3;2,4}, {5,7;6,8}));
+
+// Concatenating some directions
+assert_checkequal(num2cell(h,1), cat(3,{[1;2],[3;4]}, {[5;6],[7;8]}));
+assert_checkequal(num2cell(h,2), cat(3,{[1 3]; [2 4]}, {[5 7]; [6 8]}));
+assert_checkequal(num2cell(h,3), ..
+                     {cat(3,1,5), cat(3,3,7); cat(3,2,6), cat(3,4,8)});
+assert_checkequal(num2cell(h,[1 2]), cat(3,{[1 3; 2 4]},{[5 7; 6 8]}));
+assert_checkequal(num2cell(h,1:3), {h});
+
+// --------
+// For text
+// --------
+assert_checkequal(num2cell(""), {""});
+assert_checkequal(num2cell(["" ""]), {"",""});
+assert_checkequal(num2cell(["" "";"" ""]), {"","";"" ""});
+
+assert_checkequal(num2cell(["1" "2" "3" "4"]), {"1","2","3","4"});
+assert_checkequal(num2cell(["1" "2" "3" "4"]'), {"1","2","3","4"}');
+assert_checkequal(num2cell(["1" "2" ; "3" "4"]), {"1", "2" ; "3", "4"});
+h = matrix(["1" "2" "3" "4" "5" "6" "7" "8"], 2,2,2);
+assert_checkequal(num2cell(h), cat(3,{"1","3"; "2","4"}, {"5","7"; "6","8"}));
+
+// Concatenating some directions
+assert_checkequal(num2cell(["" "";"" ""], 2), {["" ""] ; ["" ""]});
+
+assert_checkequal(num2cell(h,1), cat(3,{["1";"2"],["3";"4"]}, {["5";"6"],["7";"8"]}));
+assert_checkequal(num2cell(h,2), cat(3,{["1" "3"];["2" "4"]}, {["5" "7"];["6" "8"]}));
+assert_checkequal(num2cell(h,3), ..
+              {cat(3,"1","5"), cat(3,"3","7"); cat(3,"2","6"), cat(3,"4","8")});
+assert_checkequal(num2cell(h,[1 2]), cat(3,{["1" "3";"2" "4"]},{["5" "7";"6" "8"]}));
+assert_checkequal(num2cell(h,1:3), {h});