prefer imports to help meld with other programs

Author: scivision

+hdf5nc/h5exists.m

@@ -11,9 +11,11 @@
   varnames (1,:) string
 end
 
+import hdf5nc.h5variables
+
 i = startsWith(varnames, "/");
 varnames(i) = extractAfter(varnames(i), 1);
-
-exists = ismember(varnames, hdf5nc.h5variables(filename));
+% NOT contains because we want exact string match
+exists = ismember(varnames, h5variables(filename));
 
 end % function

+hdf5nc/h5save.m

@@ -10,7 +10,13 @@ function h5save(filename, varname, A, opts)
   opts.type string = string.empty
 end
 
-filename = hdf5nc.expanduser(filename);
+import hdf5nc.*
+
+if isnumeric(A)
+  mustBeReal(A)
+end
+
+filename = expanduser(filename);
 
 if isempty(opts.size)
   if isvector(A)
@@ -22,13 +28,13 @@ function h5save(filename, varname, A, opts)
   sizeA = opts.size;
 end
 % coerce if needed
-A = hdf5nc.coerce_ds(A, opts.type);
+A = coerce_ds(A, opts.type);
 if ischar(A)
   A = string(A);
   sizeA = size(A);
 end
 
-if isfile(filename) && hdf5nc.h5exists(filename, varname)
+if isfile(filename) && h5exists(filename, varname)
   exist_file(filename, varname, A, sizeA)
 else
   new_file(filename, varname, A, sizeA)
@@ -38,8 +44,8 @@ function h5save(filename, varname, A, opts)
 
 
 function exist_file(filename, varname, A, sizeA)
-
-diskshape = hdf5nc.h5size(filename, varname);
+import hdf5nc.h5size
+diskshape = h5size(filename, varname);
 if length(diskshape) >= 2
   % start is always a row vector, regardless of shape of array
   start = ones(1,ndims(A));
@@ -61,7 +67,7 @@ function exist_file(filename, varname, A, sizeA)
 
 
 function new_file(filename, varname, A, sizeA)
-
+import hdf5nc.auto_chunk_size
 folder = fileparts(filename);
 assert(isfolder(folder), '%s is not a folder, cannot create %s', folder, filename)
 
@@ -72,7 +78,7 @@ function new_file(filename, varname, A, sizeA)
   % C / Python
   h5create(filename, varname, sizeA, 'DataType', class(A), ...
     'Deflate', 1, 'Fletcher32', true, 'Shuffle', true, ...
-    'ChunkSize', hdf5nc.auto_chunk_size(sizeA))
+    'ChunkSize', auto_chunk_size(sizeA))
 end % if
 
 h5write(filename, varname, A)

+hdf5nc/h5size.m

@@ -10,7 +10,9 @@
   variable (1,1) string
 end
 
-finf = h5info(hdf5nc.expanduser(filename), variable);
+import hdf5nc.expanduser
+
+finf = h5info(expanduser(filename), variable);
 fsize = finf.Dataspace.Size;
 
 end % function

+hdf5nc/h5variables.m

@@ -5,10 +5,12 @@
   group string = string.empty
 end
 
+import hdf5nc.expanduser
+
 names = string.empty;
 groups = string.empty;
 
-finf = h5info(hdf5nc.expanduser(filename));
+finf = h5info(expanduser(filename));
 ds = finf.Datasets;
 if isempty(ds)
   return

+hdf5nc/isoctave.m

@@ -11,7 +11,9 @@
   varnames (1,:) string
 end
 
+import hdf5nc.ncvariables
+
 % NOT contains because we want exact string match
-exists = ismember(varnames, hdf5nc.ncvariables(filename));
+exists = ismember(varnames, ncvariables(filename));
 
 end % function

+hdf5nc/ncexists.m

@@ -10,7 +10,9 @@ function ncsave(filename, varname, A, opts)
   opts.type string = string.empty
 end
 
-filename = hdf5nc.expanduser(filename);
+import hdf5nc.*
+
+filename = expanduser(filename);
 
 if isempty(opts.dims)
   if isscalar(A)
@@ -38,9 +40,9 @@ function ncsave(filename, varname, A, opts)
   end
 end
 % coerce if needed
-A = hdf5nc.coerce_ds(A, opts.type);
+A = coerce_ds(A, opts.type);
 
-if isfile(filename) && hdf5nc.ncexists(filename, varname)
+if isfile(filename) && ncexists(filename, varname)
   exist_file(filename, varname, A, sizeA)
 else
   new_file(filename, varname, A, sizeA, ncdims)
@@ -50,8 +52,8 @@ function ncsave(filename, varname, A, opts)
 
 
 function exist_file(filename, varname, A, sizeA)
-
-diskshape = hdf5nc.ncsize(filename, varname);
+import hdf5nc.ncsize
+diskshape = ncsize(filename, varname);
 
 if all(diskshape == sizeA)
   ncwrite(filename, varname, A)
@@ -65,7 +67,7 @@ function exist_file(filename, varname, A, sizeA)
 
 
 function new_file(filename, varname, A, sizeA, ncdims)
-
+import hdf5nc.auto_chunk_size
 folder = fileparts(filename);
 assert(isfolder(folder), '%s is not a folder, cannot create %s', folder, filename)
 
@@ -81,15 +83,15 @@ function new_file(filename, varname, A, sizeA, ncdims)
   nccreate(filename, varname, 'Dimensions', ncdims, ...
     'Datatype', class(A), ...
     'DeflateLevel', 1, 'Shuffle', true, ...
-    'ChunkSize', hdf5nc.auto_chunk_size(sizeA), ...
+    'ChunkSize', auto_chunk_size(sizeA), ...
     'Format', 'netcdf4')
 end
 
 ncwrite(filename, varname, A)
 
 end % function
 
-% Copyright 2020 Michael Hirsch, Ph.D.
+% Copyright 2020 Michael Hirsch
 
 % Licensed under the Apache License, Version 2.0 (the "License");
 % you may not use this file except in compliance with the License.

+hdf5nc/ncsave.m

@@ -10,7 +10,9 @@
   varname (1,1) string
 end
 
-vinf = ncinfo(hdf5nc.expanduser(filename), varname);
+import hdf5nc.expanduser
+
+vinf = ncinfo(expanduser(filename), varname);
 fsize = vinf.Size;
 
 % Octave compatibility

+hdf5nc/ncsize.m

@@ -4,7 +4,9 @@
   filename (1,1) string
 end
 
-finf = ncinfo(hdf5nc.expanduser(filename));
+import hdf5nc.expanduser
+
+finf = ncinfo(expanduser(filename));
 ds = finf.Variables(:);
 names = string({ds(:).Name});
 

+hdf5nc/ncvariables.m

@@ -34,28 +34,30 @@ function teardownOnce(tc)
 
 
 function test_auto_chunk_size(tc)
-
-tc.assertEqual(hdf5nc.auto_chunk_size([1500,2500,1000,500,100]), [12,20,8,8,2], '5D chunk fail')
-tc.assertEqual(hdf5nc.auto_chunk_size([15,250,100]), [2,32,25], '3D chunk fail')
-tc.assertEqual(hdf5nc.auto_chunk_size([15,250]), [15,250], '2D small chunk fail')
+import hdf5nc.auto_chunk_size
+tc.assertEqual(auto_chunk_size([1500,2500,1000,500,100]), [12,20,8,8,2], '5D chunk fail')
+tc.assertEqual(auto_chunk_size([15,250,100]), [2,32,25], '3D chunk fail')
+tc.assertEqual(auto_chunk_size([15,250]), [15,250], '2D small chunk fail')
 
 end
 
 
 function test_get_variables(tc)
-vars = hdf5nc.h5variables(tc.TestData.basic);
+import hdf5nc.h5variables
+vars = h5variables(tc.TestData.basic);
 tc.assertEqual(sort(vars), ["A0", "A1", "A2", "A3", "A4"], 'missing variables')
 end
 
 
 function test_exists(tc)
-e0 = hdf5nc.h5exists(tc.TestData.basic, '/A3');
+import hdf5nc.h5exists
+e0 = h5exists(tc.TestData.basic, '/A3');
 tc.assertTrue(isscalar(e0))
 tc.assertTrue(e0, 'A3 exists')
 
-tc.assertFalse(hdf5nc.h5exists(tc.TestData.basic, '/oops'), 'oops not exist')
+tc.assertFalse(h5exists(tc.TestData.basic, '/oops'), 'oops not exist')
 
-e1 = hdf5nc.h5exists(tc.TestData.basic, ["A3", "oops"]);
+e1 = h5exists(tc.TestData.basic, ["A3", "oops"]);
 tc.assertTrue(isrow(e1))
 tc.assertEqual(e1, [true, false])
 end
@@ -112,12 +114,12 @@ function test_read(tc)
 
 
 function test_coerce(tc)
-
+import hdf5nc.h5save
 basic = tc.TestData.basic;
 
-hdf5nc.h5save(basic, '/int32', 0, "type", 'int32')
-hdf5nc.h5save(basic, '/int64', 0, "type", 'int64')
-hdf5nc.h5save(basic, '/float32', 0, "type", 'float32')
+h5save(basic, '/int32', 0, "type", 'int32')
+h5save(basic, '/int64', 0, "type", 'int64')
+h5save(basic, '/float32', 0, "type", 'float32')
 
 tc.assertClass(h5read(basic, '/int32'), 'int32', 'int32')
 tc.assertClass(h5read(basic, '/int64'), 'int64', 'int64')
@@ -126,13 +128,15 @@ function test_coerce(tc)
 
 
 function test_rewrite(tc)
-hdf5nc.h5save(tc.TestData.basic, '/A2', 3*magic(4))
+import hdf5nc.h5save
+h5save(tc.TestData.basic, '/A2', 3*magic(4))
 tc.assertEqual(h5read(tc.TestData.basic, '/A2'), 3*magic(4), 'rewrite 2D fail')
 end
 
 function test_string(tc)
-hdf5nc.h5save(tc.TestData.basic, "/a_string", "hello")
-hdf5nc.h5save(tc.TestData.basic, "/a_char", 'there')
+import hdf5nc.h5save
+h5save(tc.TestData.basic, "/a_string", "hello")
+h5save(tc.TestData.basic, "/a_char", 'there')
 
 astr = h5read(tc.TestData.basic, "/a_string");
 achar = h5read(tc.TestData.basic, "/a_char");
@@ -143,5 +147,6 @@ function test_string(tc)
 end
 
 function test_real_only(tc)
-tc.assertError(@() hdf5nc.h5save(tc.TestData.basic, "/bad_imag", 1j), 'MATLAB:imagesci:hdf5dataset:badInputClass')
+import hdf5nc.h5save
+tc.assertError(@() h5save(tc.TestData.basic, "/bad_imag", 1j), 'MATLAB:validators:mustBeReal')
 end