h5exists: simplify

geospace-code · Jul 8, 2024 · 7355fa8 · 7355fa8
1 parent dd72713
commit 7355fa8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 18 deletions.
diff --git a/+stdlib/+hdf5nc/h5exists.m b/+stdlib/+hdf5nc/h5exists.m
@@ -2,19 +2,11 @@
 
 arguments
   file (1,1) string {mustBeFile}
-  variable string {mustBeScalarOrEmpty}
+  variable (1,1) string
 end
 
 exists = false;
 
-if(strlength(variable) == 0)
-  return
-end
-
-if ~startsWith(variable, "/")
-  variable = "/" + variable;
-end
-
 try
   h5info(file, variable);
   exists = true;

diff --git a/+stdlib/+hdf5nc/ncexists.m b/+stdlib/+hdf5nc/ncexists.m
@@ -2,7 +2,7 @@
 
 arguments
   file (1,1) string {mustBeFile}
-  variable string {mustBeScalarOrEmpty}
+  variable (1,1) string
 end
 
 exists = false;

diff --git a/+stdlib/h5exists.m b/+stdlib/h5exists.m
@@ -11,7 +11,7 @@
 
 arguments
   file (1,1) string
-  variable string {mustBeScalarOrEmpty}
+  variable (1,1) string
 end
 
 exists = stdlib.hdf5nc.h5exists(file, variable);

diff --git a/+stdlib/ncexists.m b/+stdlib/ncexists.m
@@ -11,7 +11,7 @@
 
 arguments
   file (1,1) string
-  variable string {mustBeScalarOrEmpty}
+  variable (1,1) string
 end
 
 exists = stdlib.hdf5nc.ncexists(file, variable);

diff --git a/test/TestHDF5.m b/test/TestHDF5.m
@@ -97,13 +97,10 @@ function test_exists(tc)
 import matlab.unittest.constraints.IsScalar
 basic = tc.TestData.basic;
 
-e = stdlib.h5exists(basic, "");
+e = stdlib.h5exists(basic, "/A0");
 
 tc.verifyThat(e, IsScalar)
-tc.verifyFalse(e)
-
-tc.verifyTrue(stdlib.h5exists(basic, "/A0"));
-tc.verifyTrue(stdlib.h5exists(basic, "A0"));
+tc.verifyTrue(e);
 
 end
 
@@ -194,7 +191,7 @@ function test_shape(tc)
 function test_coerce(tc, type)
 basic = tc.TestData.basic;
 
-stdlib.h5save(basic, type, 0, "type",type)
+stdlib.h5save(basic, "/"+type, 0, "type",type)
 
 switch type
 case "string", vt = 'char';