Skip to content

Commit c9ee0ad

Browse files
yasirronirdzman
authored andcommitted
loadgenericdata support absolute path
1 parent 63bdf68 commit c9ee0ad

1 file changed

Lines changed: 18 additions & 5 deletions

File tree

lib/loadgenericdata.m

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,25 @@
9696
error('loadgenericdata: No variable named ''%s'' in ''%s.mat''', varname, rootname);
9797
end
9898
elseif strcmp(extension,'.m') %% from M file
99-
if isempty(args)
100-
var = feval(rootname);
101-
elseif iscell(args)
102-
var = feval(rootname, args{:});
99+
[pathstr, fname_only, ~] = fileparts(rootname);
100+
if isempty(pathstr)
101+
%% no path specified, use feval directly
102+
if isempty(args)
103+
var = feval(rootname);
104+
elseif iscell(args)
105+
var = feval(rootname, args{:});
106+
else
107+
var = feval(rootname, args);
108+
end
103109
else
104-
var = feval(rootname, args);
110+
%% path specified, use feval_w_path
111+
if isempty(args)
112+
var = feval_w_path(pathstr, fname_only);
113+
elseif iscell(args)
114+
var = feval_w_path(pathstr, fname_only, args{:});
115+
else
116+
var = feval_w_path(pathstr, fname_only, args);
117+
end
105118
end
106119
end
107120
else %% it's a data structure, not a file name

0 commit comments

Comments
 (0)