Add m2json test cases, fix convertDate

Author: robertoffmoura

plotly/plotly_aux/Test_m2json.m

@@ -15,25 +15,29 @@ function test2dArrayInRange0to10(tc)
 
         function testInRange1e6to1e5(tc)
             values = 1e-6 * (1 + (1:5) + 0.23456789);
-            expected = "[2.235e-06,3.235e-06,4.235e-06,5.235e-06,6.235e-06]";
+            expected = "[2.235e-06,3.235e-06,4.235e-06,5.235e-06," ...
+                    + "6.235e-06]";
             tc.verifyEqual(string(m2json(values)), expected);
         end
 
         function testInRange1e14Plus0to1(tc)
             values = 1e14 + (1:5) + 0.23456789;
-            expected = "[100000000000001,100000000000002,100000000000003,100000000000004,100000000000005]";
+            expected = "[100000000000001,100000000000002,"...
+                    + "100000000000003,100000000000004,100000000000005]";
             tc.verifyEqual(string(m2json(values)), expected);
         end
 
         function testInRange1e14Plus1e7Plus0to1(tc)
             values = 1e14 + 1e7 + (1:5) + 0.23456789;
-            expected = "[100000010000001,100000010000002,100000010000003,100000010000004,100000010000005]";
+            expected = "[100000010000001,100000010000002," ...
+                    + "100000010000003,100000010000004,100000010000005]";
             tc.verifyEqual(string(m2json(values)), expected);
         end
 
         function testLogScaledVariables(tc)
             values = 1e14 + 10.^(1:5) + 0.23456789;
-            expected = "[1e+14,1.000000000001e+14,1.00000000001e+14,1.0000000001e+14,1.000000001e+14]";
+            expected = "[1e+14,1.000000000001e+14,1.00000000001e+14," ...
+                    + "1.0000000001e+14,1.000000001e+14]";
             tc.verifyEqual(string(m2json(values)), expected);
         end
 
@@ -45,14 +49,65 @@ function testInRangeMinus10to0(tc)
 
         function testInRangeMinus1e5toMinus1e6(tc)
             values = -1e-6 * (1 + (1:5) + 0.23456789);
-            expected = "[-2.235e-06,-3.235e-06,-4.235e-06,-5.235e-06,-6.235e-06]";
+            expected = "[-2.235e-06,-3.235e-06,-4.235e-06,-5.235e-06," ...
+                    + "-6.235e-06]";
             tc.verifyEqual(string(m2json(values)), expected);
         end
 
         function testInRangeMinus1e14Plus0to1(tc)
             values = -1e14 + (1:5) + 0.23456789;
-            expected = "[-99999999999998.8,-99999999999997.8,-99999999999996.8,-99999999999995.8,-99999999999994.8]";
+            expected = "[-99999999999998.8,-99999999999997.8," ...
+                    + "-99999999999996.8,-99999999999995.8," ...
+                    + "-99999999999994.8]";
             tc.verifyEqual(string(m2json(values)), expected);
         end
+
+        function testCell(tc)
+            values = {1, "text", [1,2,3]};
+            expected = "[1, ""text"", [1,2,3]]";
+            tc.verifyEqual(string(m2json(values)), expected);
+        end
+
+        function testStruct(tc)
+            values = struct("a", 1, "b", "text");
+            expected = "{""a"" : 1, ""b"" : ""text""}";
+            tc.verifyEqual(string(m2json(values)), expected);
+        end
+
+        function testDatetime(tc)
+            value = datetime("2023-05-01 12:30:45");
+            expected = """2023-05-01 12:30:45""";
+            tc.verifyEqual(string(m2json(value)), expected);
+        end
+
+        function testDate(tc)
+            value = datetime("2023-05-01");
+            expected = """2023-05-01""";
+            tc.verifyEqual(string(m2json(value)), expected);
+        end
+
+        function testLogicalTrue(tc)
+            value = true;
+            expected = "true";
+            tc.verifyEqual(string(m2json(value)), expected);
+        end
+
+        function testLogicalFalse(tc)
+            value = false;
+            expected = "false";
+            tc.verifyEqual(string(m2json(value)), expected);
+        end
+
+        function testCharArray(tc)
+            value = 'Hello';
+            expected = """Hello""";
+            tc.verifyEqual(string(m2json(value)), expected);
+        end
+
+        function testString(tc)
+            value = "World";
+            expected = """World""";
+            tc.verifyEqual(string(m2json(value)), expected);
+        end
     end
 end

plotly/plotly_aux/m2json.m

@@ -5,9 +5,12 @@
         valstr = cell2json(val);
     elseif isa(val, "numeric")
         sz = size(val);
-        numDigits = 3 + ceil(clip(log10(double(max(abs(val),[],"all"))) ...
-                - log10(double(range(val,"all"))),0,12));
-        numDigits(~isfinite(numDigits)) = 7;
+        numDigits = max(arrayfun(@getPrecision, val));
+        if isa(val,"single")
+            numDigits = min(7, numDigits);
+        else
+            numDigits = min(15, numDigits);
+        end
         fmt = sprintf("%%.%ig", numDigits);
         if sum(sz>1)>1 % 2D or higher array
             valsubstr = strings(1, sz(1));
@@ -21,7 +24,11 @@
             valstr = arrayfun(@(x) sprintf(fmt, x), val);
             valstr = strjoin(valstr, ",");
         end
-        valstr = "[" + valstr + "]";
+        if length(val)>1
+            valstr = "[" + valstr + "]";
+        elseif isempty(val)
+            valstr = "[]";
+        end
         valstr = strrep(valstr,"-Inf", "null");
         valstr = strrep(valstr, "Inf", "null");
         valstr = strrep(valstr, "NaN", "null");
@@ -55,7 +62,6 @@
     end
 end
 
-function x = clip(x,lb,ub)
-    x(x<lb) = lb;
-    x(x>ub) = ub;
+function numDigits = getPrecision(val)
+    numDigits = strlength(sprintf("%.15g", val));
 end

plotly/plotlyfig_aux/helpers/convertDate.m

@@ -1,15 +1,16 @@
 function output = convertDate(date)
     date = convertToDateTime(date);
     if isDate(date)
-        format = "yyyy-mm-dd";
+        format = "yyyy-MM-dd";
     else
-        format = "yyyy-mm-dd HH:MM:ss";
+        format = "yyyy-MM-dd HH:mm:ss";
     end
     output = string(date, format);
 end
 
 function dt = convertToDateTime(input)
     if isdatetime(input)
+        dt = input;
         return
     elseif isnumeric(input)
         % Assume input is a datenum