allow empty filenames--returns empty

Author: scivision

+hdf5nc/TestHDF5.m

@@ -69,6 +69,12 @@ function test_get_variables(tc)
 import hdf5nc.h5variables
 basic = tc.TestData.basic;
 
+tc.verifyEmpty(h5variables(string.empty))
+tc.verifyEmpty(h5variables(string.empty, string.empty))
+[a,b] = h5variables(string.empty, "hi");
+tc.verifyEmpty(a)
+tc.verifyEmpty(b)
+
 v = h5variables(basic);
 tc.verifyEqual(sort(v), ["A0", "A1", "A2", "A3", "A4"])
 
@@ -110,6 +116,9 @@ function test_exists(tc, vars)
 % empty
 e = h5exists(basic, string.empty);
 tc.verifyEmpty(e)
+
+tc.verifyEqual(h5exists(string.empty, ["oops", "hi"]), [false, false])
+tc.verifyEmpty(h5exists(string.empty, string.empty))
 end
 
 
@@ -139,7 +148,9 @@ function test_size(tc)
 tc.verifyEqual(s, [4,3,2,5])
 
 % empty
-tc.verifyError(@() h5size(basic, string.empty), 'MATLAB:validation:IncompatibleSize')
+tc.verifyEmpty(h5size(basic, string.empty))
+tc.verifyEmpty(h5size(string.empty, string.empty))
+tc.verifyEmpty(h5size(string.empty, "hi"))
 end
 
 

+hdf5nc/TestNetCDF.m

@@ -54,8 +54,12 @@ function cleanup(tc)
 methods (Test)
 function test_get_variables(tc)
 import hdf5nc.ncvariables
+basic = tc.TestData.basic;
+
+tc.verifyEmpty(ncvariables(string.empty))
 
-tc.verifyEqual(sort(ncvariables(tc.TestData.basic)), ["A0", "A1", "A2", "A3", "A4"])
+
+tc.verifyEqual(sort(ncvariables(basic)), ["A0", "A1", "A2", "A3", "A4"])
 end
 
 
@@ -76,6 +80,9 @@ function test_exists(tc, vars)
 % empty
 e = ncexists(basic, string.empty);
 tc.verifyEmpty(e)
+
+tc.verifyEqual(ncexists(string.empty, ["oops", "hi"]), [false, false])
+tc.verifyEmpty(ncexists(string.empty, string.empty))
 end
 
 
@@ -105,7 +112,9 @@ function test_size(tc)
 tc.verifyEqual(s, [4,3,2,5])
 
 % empty
-tc.verifyError(@() ncsize(basic, string.empty), 'MATLAB:validation:IncompatibleSize')
+tc.verifyEmpty(ncsize(basic, string.empty))
+tc.verifyEmpty(ncsize(string.empty, string.empty))
+tc.verifyEmpty(ncsize(string.empty, "hi"))
 end
 
 

+hdf5nc/h5exists.m

@@ -11,7 +11,7 @@
 % exists: boolean (scalar or vector)
 
 arguments
-  file (1,1) string
+  file string
   varnames (1,:) string
 end
 

+hdf5nc/h5size.m

@@ -2,17 +2,27 @@
 % get size (shape) of an HDF5 dataset
 %
 % filename: HDF5 filename
-% variable: name of variable inside HDF5 file
+% variable: name of variable inside file
 %
 % fsize: vector of variable size per dimension
 arguments
-  file (1,1) string
-  variable (1,1) string
+  file string
+  variable string
 end
 
+assert(length(file)<2, "one file at a time")
+assert(length(variable)<2, "one variable at a time")
+
+fsize = [];
+
 file = expanduser(file);
+
+if isempty(file) || isempty(variable)
+  return
+end
+
 if ~isfile(file)
-  error('hdf5nc:h5size:fileNotFound', "%s does not exist", file)
+  error("hdf5nc:h5size:fileNotFound", "%s not found.", file)
 end
 
 fsize = h5info(file, variable).Dataspace.Size;

+hdf5nc/h5variables.m

@@ -13,18 +13,26 @@
 % groups: file groups
 
 arguments
-  file (1,1) string
+  file string
   group string = string.empty
 end
 
+assert(length(file)<2, "one file at a time")
+assert(length(group)<2, "one group at a time")
+
 file = expanduser(file);
-if ~isfile(file)
-  error('hdf5nc:h5variables:fileNotFound', "%s does not exist", file)
-end
 
 names = string.empty;
 groups = string.empty;
 
+if isempty(file)
+  return
+end
+
+if ~isfile(file)
+  error("hdf5nc:h5variables:fileNotFound", "%s not found.", file)
+end
+
 if isempty(group)
   finf = h5info(file);
 else

+hdf5nc/ncexists.m

@@ -11,7 +11,7 @@
 % exists: boolean (scalar or vector)
 
 arguments
-  file (1,1) string
+  file string
   varnames (1,:) string
 end
 

+hdf5nc/ncsize.m

@@ -6,13 +6,23 @@
 %
 % fsize: vector of variable size per dimension
 arguments
-  file (1,1) string
-  variable (1,1) string
+  file string
+  variable string
 end
 
+assert(length(file)<2, "one file at a time")
+assert(length(variable)<2, "one variable at a time")
+
+fsize = [];
+
 file = expanduser(file);
+
+if isempty(file) || isempty(variable)
+  return
+end
+
 if ~isfile(file)
-  error('hdf5nc:ncsize:fileNotFound', "%s does not exist", file)
+  error("hdf5nc:ncsize:fileNotFound", "%s not found.", file)
 end
 
 fsize = ncinfo(file, variable).Size;

+hdf5nc/ncvariables.m

@@ -10,12 +10,21 @@
 % names: variable names
 
 arguments
-  file (1,1) string
+  file string
 end
 
+assert(length(file)<2, "one file at a time")
+
 file = expanduser(file);
+
+names = string.empty;
+
+if isempty(file)
+  return
+end
+
 if ~isfile(file)
-  error('hdf5nc:ncvariables:fileNotFound', "%s does not exist", file)
+  error("hdf5nc:ncvariables:fileNotFound", "%s not found.", file)
 end
 
 finf = ncinfo(file);