filename: selectable pattern | regexp

Author: scivision

+stdlib/filename.m

@@ -5,8 +5,21 @@
 %%% Outputs
 % filename (including suffix) without directory
 
-function f = filename(p)
+function f = filename(p, method)
+arguments
+  p
+  method = 'pattern'
+end
 
-f = extractAfter(p, asManyOfPattern(wildcardPattern + ("/" | filesep)));
+% the pattern method is a few percent faster than regexp  
+switch method
+  case 'pattern', f = extractAfter(p, asManyOfPattern(wildcardPattern + ("/" | filesep)));
+  case 'regexp'
+    f = regexp(p, ['[^/\' filesep ']*$'], 'match', 'once');
+    try %#ok<TRYNC>
+      f(ismissing(f)) = "";
+    end
+  otherwise, error('unknown method %s', method)
+end
 
 end

test/TestFilename.m

@@ -3,6 +3,7 @@
 properties (TestParameter)
 p = init_p()
 e = {'/a/b/c/', "a/b/c/"}
+method = {'pattern', 'regexp'}
 end
 
 methods(TestClassSetup)
@@ -13,12 +14,15 @@ function pkg_path(tc)
 end
 
 methods (Test, TestTags="pure")
-function test_filename(tc, p)
-tc.verifyEqual(stdlib.filename(p{1}), p{2})
+
+function test_filename(tc, p, method)
+fn = stdlib.filename(p{1}, method);
+tc.verifyEqual(fn, p{2})
 end
 
-function test_filename_empty(tc, e)
-tc.verifyEqual(strlength(stdlib.filename(e)), 0)
+function test_filename_empty(tc, e, method)
+fn = stdlib.filename(e, method);
+tc.verifyEqual(strlength(fn), 0)
 end
 
 end