Changeset 137 for prdatasets/pr_getdata.m

Timestamp:

12/18/19 15:46:35 (5 years ago)

Author:

bduin

Message:

 

Location:

prdatasets

Files:

• . (modified) (1 prop)
• pr_getdata.m (modified) (6 diffs)

prdatasets

@@ -3 +3 @@
 *.data
 *.asv
+data

@@ -3 +3 @@
 *.data
 *.asv
+data

prdatasets/pr_getdata.m

@@ -10 +10 @@
 % If given, SIZE (in MByte) is displayed in the request.
 %
-% If available, the dataset DSET stored in FIELD is returned in OUT.
-% In case of a datafile DFILE, it is created, if necessary, with given TYPE
-% and returned in OUT. In case the download was successful but no dataset
-% or datfile could be created (e.g. because of empty TYPE) OUT is empty, 
-% otherwise an error is generated.
+% A mat-file returns a structure with fields pointing to stored variables.
+% If available, the dataset DSET stored in FIELD (default 1) is returned in
+% OUT. In case of a datafile DFILE, it is created, if necessary, with given
+% TYPE and returned in OUT. In case the download was successful but no
+% dataset or datfile could be created (e.g. because of empty TYPE) OUT is
+% empty, otherwise an error is generated.
 %
 % This is a low-level routine, typically used in COMMAND and not called
@@ -20 +21 @@
 % is constucted and returned to the user.
 %
-% SEE ALSO DATASETS, DATAFILES
+% SEE ALSO (<a href="http://37steps.com/prhtml/37tools.html">37tools Contents</a>)
+% DATASETS, DATAFILES
 
-% Copyright: R.P.W. Duin
+% Copyright: R.P.W. Duin, r.p.w.duin@37steps.com
 
 function out = pr_getdata(varargin)
@@ -33 +35 @@
 %  dset  : becomes full path and name of dataset
 %  ddir  : becomes full path of dataset
-name = callername;
+name = pr_callername;
 argin = setdefaults(varargin,[],[],[],[],true);
 [url,size,dset,field,ask] = deal(argin{:});
+
+if isempty(url)
+  url = ['http://prtools.tudelft.nl/prdatasets/' name '.mat'];
+end
 [dummy,uname,ext] = fileparts(url);
 
@@ -41 +47 @@
   ddir = pwd;
 else
-  ddir = fileparts(which(name));
+  ddir = fullfile(fileparts(which(name)),'data');
 end
 
@@ -117 +123 @@
   try
     s = prload(dsetmat);
-  catch 
+  catch ME
     out = 'error';
     return
@@ -143 +149 @@
 end
 
-function name = callername
-[ss,dummy] = dbstack;
-if length(ss) < 3
-        name = [];
-else
-        name = ss(3).name;
-end
 
 

@@ -3 +3 @@
 *.data
 *.asv
+data