bugfix: h5save write scalar new. add: h5save write int8, int16

Author: scivision

+stdlib/+hdf5nc/h5save.m

@@ -72,6 +72,7 @@ function new_file(filename, varname, A, sizeA)
 if isempty(sizeA)
   if isscalar(A)
     h5_write_scalar(filename, varname, A)
+    return
   elseif isvector(A)
     h5create(filename, varname, length(A), 'DataType', class(A))
   else
@@ -81,6 +82,7 @@ function new_file(filename, varname, A, sizeA)
   if isscalar(sizeA)
     if sizeA == 0
       h5_write_scalar(filename, varname, A)
+      return
     else
       h5create(filename, varname, sizeA, 'DataType', class(A))
     end

+stdlib/+hdf5nc/private/coerce_ds.m

@@ -25,11 +25,19 @@
     if ~isa(A, 'single')
       A = single(A);
     end
-  case {'int32'}
+ case 'int8'
+     if ~isa(A, 'int8')
+       A = int8(A);
+     end
+ case 'int16'
+     if ~isa(A, 'int16')
+       A = int16(A);
+     end
+  case 'int32'
      if ~isa(A, 'int32')
        A = int32(A);
      end
-  case {'int64'}
+  case 'int64'
      if ~isa(A, 'int64')
        A = int64(A);
      end

+stdlib/+hdf5nc/private/h5_write_scalar.m

@@ -1,6 +1,12 @@
 function h5_write_scalar(filename, varname, A)
 %% write HDF5 scalar as a scalar
 %  h5create doesn't support scalars
+arguments
+  filename (1,1) string {mustBeNonzeroLengthText}
+  varname (1,1) string {mustBeNonzeroLengthText}
+  A (1,1)
+end
+
 dcpl = 'H5P_DEFAULT';
 
 if isfile(filename)

+stdlib/TestHDF5.m

@@ -5,7 +5,7 @@
 end
 
 properties (TestParameter)
-type = {'single', 'double', 'int32', 'int64'}
+type = {'single', 'double', 'int8', 'int16', 'int32', 'int64'}
 vars = {'A0', 'A1', 'A2', 'A3', 'A4'}
 str = {"string", 'char'}
 end
@@ -239,6 +239,27 @@ function test_rewrite(tc)
 tc.verifyEqual(h5read(basic, '/A2'), 3*magic(4))
 end
 
+function test_int8(tc)
+import stdlib.hdf5nc.h5save
+basic = tc.TestData.basic;
+
+h5save(basic, "/i1", int8(127))
+
+a = h5read(basic, "/i1");
+tc.verifyEqual(a, int8(127))
+
+% test rewrite
+h5save(basic, "/i1", int8(-128))
+
+a = h5read(basic, "/i1");
+tc.verifyEqual(a, int8(-128))
+
+% test int8 array
+h5save(basic, "/Ai1", int8([1, 2]))
+a = h5read(basic, "/Ai1");
+tc.verifyEqual(a, int8([1;2]))
+end
+
 function test_string(tc, str)
 import stdlib.hdf5nc.h5save
 basic = tc.TestData.basic;
@@ -247,6 +268,12 @@ function test_string(tc, str)
 
 a = h5read(basic, "/"+str);
 tc.verifyEqual(a, char(str))
+
+% test rewrite
+h5save(basic, "/"+str, str+"hi")
+
+a = h5read(basic, "/"+str);
+tc.verifyEqual(a, char(str+"hi"))
 end
 
 function test_name_only(tc)

codemeta.json

@@ -4,7 +4,7 @@
     "license": "https://spdx.org/licenses/MIT",
     "codeRepository": "https://github.com/geospace-code/matlab-stdlib",
     "contIntegration": "https://github.com/geospace-code/matlab-stdlib/actions",
-    "dateModified": "2022-04-25",
+    "dateModified": "2022-05-19",
     "downloadUrl": "https://github.com/geospace-code/matlab-stdlib/releases",
     "issueTracker": "https://github.com/geospace-code/matlab-stdlib/issues",
     "name": "matlab-stdlib",