canonical,resolve: faster, simpler

Author: scivision

+stdlib/+native/canonical.m

@@ -4,13 +4,8 @@
   strict (1,1) logical = false
 end
 
-try
-  rp = matlab.io.internal.filesystem.resolvePath(file);
-  c = string({rp.ResolvedPath});
-catch
-  c = "";
-  return
-end
+rp = matlab.io.internal.filesystem.resolvePath(file);
+c = string({rp.ResolvedPath});
 
 if strict
   return

+stdlib/canonical.m

@@ -9,24 +9,24 @@
 %%% Inputs
 % * p: path to make canonical
 % * strict: if true, only return canonical path if it exists. If false, return normalized path if path does not exist.
-% * backend: backend to use
 %%% Outputs
 % * c: canonical path, if determined
-% * b: backend used
 
-function [c, b] = canonical(p, strict, backend)
+function c = canonical(p, strict)
 arguments
   p string
   strict (1,1) logical = false
-  backend (1,:) string = ["native", "legacy"]
 end
 
-[fun, b] = hbackend(backend, "canonical");
-
-if isscalar(p) || b == "native"
-  c = fun(p, strict);
-else
-  c = arrayfun(fun, p, repmat(strict, size(p)));
+try
+  c = stdlib.native.canonical(p, strict);
+catch e
+  switch e.identifier
+    case {'MATLAB:UndefinedFunction', 'MATLAB:undefinedVarOrClass'}
+      c = stdlib.legacy.canonical(p, strict);
+    otherwise
+      rethrow(e)
+  end
 end
 
 end

+stdlib/resolve.m

@@ -3,21 +3,18 @@
 % effectively canonical(absolute(p))
 %%% Inputs
 % * p: path to make absolute
-% * backend: backend to use
 %%% Outputs
 % * c: resolved path
-% * b: backend used
 
 % distinct from canonical(), resolve() always returns absolute path
 % non-existant path is made absolute relative to pwd
 
-function [r, b] = resolve(p, strict, backend)
+function r = resolve(p, strict)
 arguments
   p string
   strict (1,1) logical = false
-  backend (1,:) string = ["native", "legacy"]
 end
 
-[r, b] = stdlib.canonical(stdlib.absolute(p), strict, backend);
+r = stdlib.canonical(stdlib.absolute(p), strict);
 
 end

example/bench_canonical.m

@@ -0,0 +1,14 @@
+function bench_canonical()
+
+in = mfilename("fullpath") + ".m";
+r = fileparts(fileparts(in));
+addpath(r)
+obj = onCleanup(@() rmpath(r));
+
+f = timeit(@() stdlib.canonical(in)) * 1e3;
+n = timeit(@() stdlib.native.canonical(in)) * 1e3;
+l = timeit(@() stdlib.legacy.canonical(in)) * 1e3;
+
+fprintf('Full %f\nNative: %f\nLegacy: %f\n', f, n, l);
+
+end

test/TestCanonical.m

@@ -10,7 +10,6 @@
 {"not-exist/a/..", "not-exist"}, ...
 {"./not-exist", "not-exist"}
 };
-backend = init_backend({'native', 'legacy'}, 'native', ~isMATLABReleaseOlderThan('R2024a'))
 end
 
 methods(TestClassSetup)
@@ -24,16 +23,23 @@ function test_dirs(tc)
 
 methods(Test)
 
-function test_canonical(tc, p, backend)
-c = stdlib.canonical(p{1}, false, backend);
+function test_canonical(tc, p)
+c = stdlib.canonical(p{1}, false);
 tc.verifyEqual(c, p{2})
 end
 
+function test_legacy_canonical(tc, p)
+c = stdlib.legacy.canonical(p{1}, false);
+tc.verifyEqual(c, p{2})
+end
+
+
+function test_canonical_array(tc)
+tc.assumeFalse(stdlib.matlabOlderThan('R2024a'))
 
-function test_canonical_array(tc, backend)
 in = ["", "hi", "/ok", "not-exist/a/.."];
 
-c = stdlib.canonical(in, false, backend);
+c = stdlib.canonical(in, false);
 exp = ["", "hi", filesep + "ok", "not-exist"];
 tc.verifyEqual(c, exp)
 end

test/TestResolve.m

@@ -3,7 +3,6 @@
 
 properties (TestParameter)
 p = {'', "", ".", ".."}
-backend = init_backend({'native', 'legacy'}, 'native', ~isMATLABReleaseOlderThan('R2024a'))
 end
 
 methods(TestClassSetup)
@@ -17,49 +16,51 @@ function test_dirs(tc)
 
 methods (Test)
 
-function test_resolve_relative(tc, backend)
+function test_resolve_relative(tc)
 import matlab.unittest.constraints.StartsWithSubstring
 import matlab.unittest.constraints.ContainsSubstring
 
 % all non-existing files
 
-pabs = stdlib.resolve('2foo', false, backend);
-pabs2 = stdlib.resolve('4foo', false, backend);
+pabs = stdlib.resolve('2foo', false);
+pabs2 = stdlib.resolve('4foo', false);
 tc.verifyThat(pabs, ~StartsWithSubstring("2"))
 tc.verifyThat(pabs, StartsWithSubstring(extractBefore(pabs2, 3)))
 
-par1 = stdlib.resolve("../2foo", false, backend);
+par1 = stdlib.resolve("../2foo", false);
 tc.verifyNotEmpty(par1)
 tc.verifyThat(par1, ~ContainsSubstring(".."))
 
-par2 = stdlib.resolve("../4foo", false, backend);
+par2 = stdlib.resolve("../4foo", false);
 tc.verifyThat(par2, StartsWithSubstring(extractBefore(pabs2, 3)))
 
-pt1 = stdlib.resolve("bar/../2foo", false, backend);
+pt1 = stdlib.resolve("bar/../2foo", false);
 tc.verifyNotEmpty(pt1)
 tc.verifyThat(pt1, ~ContainsSubstring(".."))
 
-va = stdlib.resolve("2foo", false, backend);
-vb = stdlib.resolve("4foo", false, backend);
+va = stdlib.resolve("2foo", false);
+vb = stdlib.resolve("4foo", false);
 tc.verifyThat(va, ~StartsWithSubstring("2"))
 tc.verifyThat(va, StartsWithSubstring(extractBefore(vb, 3)))
 
 end
 
-function test_resolve_fullpath(tc, p, backend)
+function test_resolve_fullpath(tc, p)
 
 a = p;
 switch a
   case {'', "", '.', "."}, b = string(pwd());
   case {'..', ".."}, b = string(fileparts(pwd()));
 end
 
-tc.verifyEqual(stdlib.resolve(a, false, backend), b)
+tc.verifyEqual(stdlib.resolve(a, false), b)
 end
 
-function test_resolve_array(tc, backend)
+function test_resolve_array(tc)
+tc.assumeFalse(stdlib.matlabOlderThan('R2024a'))
+
 in = ["", "hi", "/ok", "not-exist/a/.."];
-c = stdlib.resolve(in, false, backend);
+c = stdlib.resolve(in, false);
 
 exp = [pwd(), fullfile(pwd(), "hi"), filesep + "ok", fullfile(pwd(), "not-exist")];
 if ispc()