speedup and compatibility

Author: scivision

+stdlib/filename.m

@@ -8,17 +8,21 @@
 function f = filename(p, backend)
 arguments
   p string
-  backend = 'pattern'
+  backend = 'fileparts'
 end
 
-% the pattern backend is a few percent faster than regexp
+% the pattern backend is a litle slower than
+% fileparts is 5x to 10x faster than regexp and pattern
 switch backend
+  case 'fileparts'
+    [~, f, ext] = fileparts(p);
+    f = f + ext;
   case 'pattern'
     f = extractAfter(p, asManyOfPattern(wildcardPattern + ("/" | filesep)));
   case 'regexp'
     f = regexp(p, ['[^/\' filesep ']*$'], 'match', 'once');
     f(ismissing(f)) = "";
-  otherwise, error('must be backend "pattern" or "regexp"')
+  otherwise, error('must be backend "pattern", "regexp" or "fileparts"')
 end
 
 end

+stdlib/h5save.m

@@ -42,7 +42,7 @@ function h5save(filename, varname, A, opts)
   h5save_exist(filename, varname, A, opts.size)
 catch e
   switch e.identifier
-    case {'MATLAB:imagesci:hdf5io:resourceNotFound', 'MATLAB:imagesci:h5info:unableToFind'}
+    case {'MATLAB:imagesci:hdf5io:resourceNotFound', 'MATLAB:imagesci:h5info:unableToFind', 'MATLAB:imagesci:h5info:fileOpenErr'}
       h5save_new(filename, varname, A, opts.size, opts.compressLevel)
     otherwise
       rethrow(e)

+stdlib/ini2struct.m

@@ -4,9 +4,6 @@
 % Based on init2struct.m by Andriy Nych
 
 function Struct = ini2struct(filename)
-arguments
-  filename {mustBeFile}
-end
 
 f = fopen(filename,'r');                    % open file
 

+stdlib/platform_tell.m

@@ -2,8 +2,13 @@
 
 function json = platform_tell()
 
-r = matlabRelease();
-raw = struct("matlab_release", r.Release, ...
+try
+  r = matlabRelease().Release;
+catch
+  r = "R" + version('-release');
+end
+
+raw = struct("matlab_release", r, ...
 "matlab_arch", computer('arch'), ...
 "cpu_arch", stdlib.cpu_arch(), ...
 "hdf5", stdlib.h5get_version(), ...
@@ -38,6 +43,14 @@
   end
 end
 
-json = jsonencode(raw, "PrettyPrint", true);
+try
+  json = jsonencode(raw, "PrettyPrint", true);
+catch e
+  if e.identifier ~= "MATLAB:json:UnmatchedParameter"
+    rethrow(e)
+  end
+
+  json = jsonencode(raw);
+end
 
 end

+stdlib/private/h5save_new.m

@@ -23,14 +23,15 @@ function h5save_new(filename, varname, A, sizeA, compressLevel)
     h5save_scalar(filename, varname, A)
     return
   else
-    h5create(filename, varname, sizeA, Datatype=class(A))
+    h5create(filename, varname, sizeA, 'Datatype', class(A))
   end
 elseif ~compressLevel || stdlib.isoctave()
-  h5create(filename, varname, sizeA, Datatype=class(A))
+  h5create(filename, varname, sizeA, 'Datatype', class(A))
 else
-  h5create(filename, varname, sizeA, Datatype=class(A), Fletcher32=true, Shuffle=true, ...
-      Chunksize=stdlib.auto_chunk_size(sizeA), ...
-      Deflate=compressLevel)
+  h5create(filename, varname, sizeA, 'Datatype', class(A), ...
+    'Fletcher32', true, 'Shuffle', true, ...
+    'Chunksize', stdlib.auto_chunk_size(sizeA), ...
+    'Deflate', compressLevel)
 end
 
 h5write(filename, varname, A)

+stdlib/set_permissions.m

@@ -13,9 +13,9 @@
 function [ok, b] = set_permissions(file, readable, writable, executable, backend)
 arguments
   file (1,1) string
-  readable (1,1) {mustBeInteger, mustBeInRange(readable, -1, 1)}
-  writable (1,1) {mustBeInteger, mustBeInRange(writable, -1, 1)}
-  executable (1,1) {mustBeInteger, mustBeInRange(executable, -1, 1)}
+  readable (1,1) {mustBeInteger}
+  writable (1,1) {mustBeInteger}
+  executable (1,1) {mustBeInteger}
   backend (1,:) string = ["native", "legacy"]
 end
 

test/TestHDF5.m

@@ -46,7 +46,7 @@ function setup_file(tc)
 
 stdlib.h5save(tc.file, '/A1', tc.A1)
 stdlib.h5save(tc.file, '/A2', tc.A2)
-stdlib.h5save(tc.file, '/A3', tc.A3, size=size(tc.A3))
+stdlib.h5save(tc.file, '/A3', tc.A3, 'size', size(tc.A3))
 stdlib.h5save(tc.file, '/A4', tc.A4)
 
 if ~stdlib.matlabOlderThan("R2020b")

test/TestNetCDF.m

@@ -59,7 +59,7 @@ function setup_file(tc)
 methods (Test, TestTags=["R2019b", "netcdf"])
 
 function test_netcdf_version(tc)
-tc.verifyTrue(stdlib.version_atleast(stdlib.nc_get_version(), "4.7"), "version unexpected")
+tc.verifyTrue(stdlib.version_atleast(stdlib.nc_get_version(), "4.6"), "version unexpected")
 end
 
 function test_get_variables(tc)

test/TestParent.m

@@ -23,7 +23,14 @@ function test_parent(tc, p, backend)
 tc.verifyEqual(pr, p{2}, sprintf("parent(%s, %s)", p{1}, backend))
 end
 
+end
+
+
+methods (Test, TestTags=["R2020b", "pure"])
+
 function test_parent_array(tc)
+tc.assumeFalse(stdlib.matlabOlderThan('R2020b'))
+
 in =  ["",  ".", "..", "../..", "a/", "a/b", "ab/.parent", "ab/.parent.txt", "a/b/../.parent.txt"];
 exp = [".", ".", ".", "..",     ".",  "a",   "ab",         "ab",             fullfile("a", "b", "..")];
 
@@ -32,7 +39,6 @@ function test_parent_array(tc)
 end
 
 end
-
 end
 
 

test/TestStem.m

@@ -28,7 +28,12 @@ function test_stem(tc, p)
 tc.verifyEqual(stdlib.stem(p{1}), p{2})
 end
 
+end
+
+methods (Test, TestTags=["R2020b", "pure"])
+
 function test_stem_array(tc)
+tc.assumeFalse(stdlib.matlabOlderThan('R2020b'))
 in = ["", ".txt", "a/b/c.txt", "a/b/c.txt.gz", "a/b/c"];
 exp = ["", ".txt", "c", "c.txt", "c"];
 out = stdlib.stem(in);