absolute: improve efficiency

Author: scivision

+stdlib/absolute.m

@@ -17,69 +17,50 @@
 % non-existant path is made absolute relative to pwd
 
 function c = absolute(p, base, expand_tilde, use_java)
-% arguments
-%   p (1,1) string
-%   base (1,1) string = ""
-%   expand_tilde (1,1) logical = true
-%   use_java (1,1) logical = false
-% end
-if nargin < 2, base = ""; end
-if nargin < 3, expand_tilde = true; end
-if nargin < 4, use_java = false; end
-
-cwd = pwd();
-
-try %#ok<TRYNC>
-  cwd = string(cwd);
-  p = string(p);
-  base = string(base);
+arguments
+  p (1,1) string
+  base (1,1) string = ""
+  expand_tilde (1,1) logical = true
+  use_java (1,1) logical = true
 end
 
-cwd = stdlib.posix(cwd);
-
-Lb = stdlib.len(base);
+if expand_tilde
+  c = stdlib.expanduser(p, use_java);
+else
+  c = stdlib.posix(p);
+end
 
-if stdlib.len(p) == 0 && Lb == 0
-   c = cwd;
-   return
+if stdlib.is_absolute(c)
+ return
 end
 
-if expand_tilde
-  c = stdlib.expanduser(p, use_java);
+if stdlib.len(base) == 0
+  b = pwd();
+elseif expand_tilde
+  b = stdlib.expanduser(base, use_java);
 else
-  c = p;
+  b = base;
 end
+b = stdlib.posix(b);
 
-if stdlib.is_absolute(c, use_java)
-  c = stdlib.posix(c);
+if stdlib.is_absolute(b)
+  if ischar(c)
+    c = strcat(b, '/', c);
+  else
+    c = b + "/" + c;
+  end
 else
-  % .getAbsolutePath(), .toAbsolutePath()
-  % default is Documents/Matlab, which is probably not wanted.
-  if Lb == 0
-    if ischar(cwd)
-      c = strcat(cwd, '/', c);
-    else
-      c = cwd + "/" + c;
-    end
+  if ischar(c)
+    c = strcat(pwd(), '/', b, '/', c);
   else
-    d = stdlib.absolute(base, "", expand_tilde, use_java);
-    if isempty(c) || stdlib.len(c) == 0
-      c = d;
-    else
-      if ischar(d)
-        c = strcat(d, '/', c);
-      else
-        c = d + "/" + c;
-      end
-    end
+    c = pwd() + "/" + b + "/" + c;
   end
 end
 
-% not needed:
-% https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/io/File.html#getAbsolutePath()
+c = stdlib.drop_slash(c);
 
 end
 
 
-%!assert(absolute('', ''), posix(pwd))
-%!assert(absolute('a/b', ''), posix(fullfile(pwd, 'a/b')))
+%!assert(absolute('', '', false), posix(pwd))
+%!assert(absolute('a/b', '', false), posix(strcat(pwd(), '/a/b')))

+stdlib/is_regular_file.m

@@ -1,9 +1,9 @@
 %% IS_REGULAR_FILE check if path is a regular file
 
 function r = is_regular_file(p)
-% arguments
-%   p (1,1) string
-% end
+arguments
+  p (1,1) string
+end
 
 % needs absolute()
 p = stdlib.absolute(p, "", false, true);

+stdlib/posix.m

@@ -4,9 +4,9 @@
 %
 
 function r = posix(p)
-% arguments
-%   p (1,1) string
-% end
+arguments
+  p (1,1) string
+end
 
 if ispc
   r = strrep(p, '\', '/');

example/bench_absolute.m

@@ -0,0 +1,17 @@
+%% benchmark
+
+f = mfilename("fullpath") + ".m";
+addpath(fullfile(fileparts(f), ".."))
+
+%f = "abc";
+
+fno = @() stdlib.absolute(f, false);
+fjava = @() stdlib.absolute(f, true);
+
+t_no = timeit(fno);
+t_java = timeit(fjava);
+
+disp("No Java: " + t_no + " s")
+disp("Java: " + t_java + " s")
+
+disp("Java is " + t_no/t_java + " times faster")

example/bench_is_readable.m

@@ -0,0 +1,17 @@
+%% benchmark
+
+f = mfilename("fullpath") + ".m";
+addpath(fullfile(fileparts(f), ".."))
+
+%f = tempname;
+
+fno = @() stdlib.is_readable(f, false);
+fjava = @() stdlib.is_readable(f, true);
+
+t_no = timeit(fno);
+t_java = timeit(fjava);
+
+disp("No Java: " + t_no + " s")
+disp("Java: " + t_java + " s")
+
+disp("Java is " + t_no/t_java + " times faster")

test/TestFilePure.m

@@ -4,7 +4,6 @@
 
 p_is_absolute
 
-
 p_filename = {
   {"", ""}, ...
   {"/a/b/c", "c"}, ...

test/TestResolve.m

@@ -7,21 +7,24 @@ function setup_path(tc)
 tc.applyFixture(matlab.unittest.fixtures.PathFixture(top))
 end
 
+
+function setup_workdir(tc)
+import matlab.unittest.constraints.IsFile
+import matlab.unittest.fixtures.TemporaryFolderFixture
+import matlab.unittest.fixtures.CurrentFolderFixture
+
+workdir = tc.applyFixture(TemporaryFolderFixture).Folder;
+tc.applyFixture(CurrentFolderFixture(workdir))
+end
+
 end
 
 
 methods(Test)
 
 function test_absolute(tc)
-import matlab.unittest.fixtures.TemporaryFolderFixture
-import matlab.unittest.fixtures.CurrentFolderFixture
-import matlab.unittest.constraints.StartsWithSubstring
-import matlab.unittest.constraints.EndsWithSubstring
 
-td = tc.applyFixture(TemporaryFolderFixture).Folder;
-tc.applyFixture(CurrentFolderFixture(td))
-
-td = stdlib.posix(string(td));
+td = stdlib.posix(string(pwd()));
 
 tc.verifyEqual(stdlib.absolute(""), td)
 tc.verifyEqual(stdlib.absolute("",""), td)
@@ -40,16 +43,10 @@ function test_absolute(tc)
 
 
 function test_resolve_non_exist(tc)
-import matlab.unittest.fixtures.TemporaryFolderFixture
-import matlab.unittest.fixtures.CurrentFolderFixture
 import matlab.unittest.constraints.StartsWithSubstring
-import matlab.unittest.constraints.EndsWithSubstring
 import matlab.unittest.constraints.ContainsSubstring
 
-td = stdlib.posix(tc.applyFixture(TemporaryFolderFixture).Folder);
-tc.applyFixture(CurrentFolderFixture(td))
-
-td = string(td);
+td = stdlib.posix(string(pwd()));
 
 % all non-existing files
 
@@ -79,22 +76,14 @@ function test_resolve_non_exist(tc)
 end
 
 function test_resolve_exist(tc)
-import matlab.unittest.fixtures.TemporaryFolderFixture
-import matlab.unittest.fixtures.CurrentFolderFixture
-import matlab.unittest.constraints.StartsWithSubstring
-import matlab.unittest.constraints.EndsWithSubstring
-import matlab.unittest.constraints.ContainsSubstring
-
-td = stdlib.posix(tc.applyFixture(TemporaryFolderFixture).Folder);
-tc.applyFixture(CurrentFolderFixture(td))
 
-td = string(td);
+td = stdlib.posix(string(pwd()));
 
 r = stdlib.parent(mfilename('fullpath'));
 rp = stdlib.parent(r);
 tc.verifyEqual(stdlib.resolve(rp), string(stdlib.parent(r)))
 
-h = stdlib.homedir;
+h = stdlib.homedir();
 tc.verifyEqual(stdlib.resolve("~"), h)
 tc.verifyEqual(stdlib.resolve("~/"), h)
 tc.verifyEqual(stdlib.resolve("~/.."), stdlib.parent(h))