samepath: speedup

Author: scivision

+stdlib/+java/samepath.m

@@ -2,13 +2,18 @@
 
 function y = samepath(path1, path2)
 
-f1 = java.io.File(path1);
-f2 = java.io.File(path2);
+try
+  f1 = java.io.File(path1);
+  f2 = java.io.File(path2);
 
-if f1.exists() && f2.exists()
-  y = java.nio.file.Files.isSameFile(javaAbsolutePath(f1), javaAbsolutePath(f2));
-else
-  y = false;
+  if f1.exists() && f2.exists()
+    y = java.nio.file.Files.isSameFile(javaAbsolutePath(f1), javaAbsolutePath(f2));
+  else
+    y = false;
+  end
+catch e
+  javaException(e)
+  y = logical.empty;
 end
 
 end

+stdlib/+perl/samepath.m

@@ -2,17 +2,19 @@
 
 r = logical.empty;
 
-exe = stdlib.perl_exe();
-if stdlib.strempty(exe)
-  return
-end
+try %#ok<TRYNC>
+  exe = stdlib.perl_exe();
+  if stdlib.strempty(exe)
+    return
+  end
 
-c = stdlib.perl.perl2cmd('(@ARGV==2) or exit 1; @s1 = stat shift or exit 1; @s2 = stat shift or exit 1; exit(($s1[0]==$s2[0] && $s1[1]==$s2[1]) ? 0 : 1)');
+  c = stdlib.perl.perl2cmd('(@ARGV==2) or exit 1; @s1 = stat shift or exit 1; @s2 = stat shift or exit 1; exit(($s1[0]==$s2[0] && $s1[1]==$s2[1]) ? 0 : 1)');
 
-cmd = sprintf('"%s" -e %s "%s" "%s"', exe, c, file1, file2);
+  cmd = sprintf('"%s" -e %s "%s" "%s"', exe, c, file1, file2);
 
-s = system(cmd);
+  s = system(cmd);
 
-r = s == 0;
+  r = s == 0;
+end
 
 end

+stdlib/samepath.m

@@ -13,24 +13,38 @@
 % * path1, path2: paths to compare
 % * backend: backend to use
 %%% Outputs
-% * ok: true if paths are the same
+% * i: true if paths are the same
 % * b: backend used
 
-function [ok, b] = samepath(path1, path2, backend)
+function [i, b] = samepath(path1, path2, backend)
 arguments
   path1 string
   path2 string
   backend (1,:) string = ["python", "java", "perl", "sys", "native"]
 end
 
-o = stdlib.Backend(mfilename(), backend);
-b = o.backend;
+i = logical.empty;
 
-if (isscalar(path1) && isscalar(path2)) || b == "native"
-  ok = o.func(path1, path2);
-else
-  ok = arrayfun(o.func, path1, path2);
-end
+for b = backend
+  switch b
+    case "java"
+      i = stdlib.java.samepath(path1, path2);
+    case "native"
+      i = stdlib.native.samepath(path1, path2);
+    case "perl"
+      i = stdlib.perl.samepath(path1, path2);
+    case "python"
+      if stdlib.matlabOlderThan('R2022a'), continue, end
+      i = stdlib.python.samepath(path1, path2);
+    case "sys"
+      i = stdlib.sys.samepath(path1, path2);
+    otherwise
+      error("stdlib:hard_link_count:ValueError", "Unknown backend: %s", b)
+  end
 
+  if ~isempty(i)
+    return
+  end
+end
 
 end

example/BenchmarkSamepath.m

@@ -22,9 +22,17 @@
 methods (Test)
 
 function bench_exist(tc, backend)
-tc.startMeasuring()
-y = tc.fun(tc.exist(1), tc.exist(2), backend);
-tc.stopMeasuring()
+while tc.keepMeasuring()
+  y = tc.fun(tc.exist(1), tc.exist(2), backend);
+end
+
+tc.verifyEqual(y, true)
+end
+
+function bench_main(tc)
+while tc.keepMeasuring()
+  y = tc.fun(tc.exist(1), tc.exist(2));
+end
 
 tc.verifyEqual(y, true)
 end

example/BenchmarkSamepathRun.m

@@ -1,24 +1,28 @@
-function [r, s] =  BenchmarkSamepathRun()
+function BenchmarkSamepathRun()
 tname = "BenchmarkSamepath";
 
 %% Exist, same
 r.same = run_bench(tname + "/bench_exist");
-s.exist = sampleSummary(r.same);
-disp(sortrows(s.exist, "Median"))
+s.exist = sortrows(sampleSummary(r.same), "Median");
+disp(s.exist(:, ["Name", "SampleSize", "Mean", "Median"]))
+%% Main
+r.main = run_bench(tname + "/bench_main");
+s.main = sortrows(sampleSummary(r.main), "Median");
+disp(s.main(:, ["Name", "SampleSize", "Mean", "Median"]))
 %% Exist, different
 r.diff = run_bench(tname + "/bench_diff");
-s.diff = sampleSummary(r.diff);
-disp(sortrows(s.diff, "Median"))
+s.diff = sortrows(sampleSummary(r.diff), "Median");
+disp(s.diff(:, ["Name", "SampleSize", "Mean", "Median"]))
 %% Not Exist
 r.not = run_bench(tname + "/bench_not_exist");
-s.not = sampleSummary(r.not);
-disp(sortrows(s.not, "Median"))
+s.not = sortrows(sampleSummary(r.not), "Median");
+disp(s.not(:, ["Name", "SampleSize", "Mean", "Median"]))
 
 end
 
 
 function result = run_bench(name)
 suite = testsuite(name);
-exp = matlab.perftest.TimeExperiment.limitingSamplingError(MaxSamples=20, RelativeMarginOfError=0.1);
+exp = matlab.perftest.TimeExperiment.limitingSamplingError(RelativeMarginOfError=0.1);
 result = exp.run(suite);
 end

test/TestSame.m

@@ -33,17 +33,7 @@ function test_samepath_notexist(tc, backend)
 tc.verifyFalse(stdlib.samepath("", "", backend))
 tc.verifyFalse(stdlib.samepath(t, t, backend))
 end
-end
-
 
-methods (Test, TestTags={'R2024a'})
-function test_samepath_array(tc, backend)
-in = [string(mfilename), string(mfilename('fullpath'))] + ".m";
-r = stdlib.samepath(in, fliplr(in), backend);
-tc.verifyClass(r, 'logical')
-tc.verifyEqual(r, [true, true])
 end
-end
-
 
 end