Changeset 142 for prdatasets/pr_download_uci.m

Timestamp:

01/05/20 23:22:59 (5 years ago)

Author:

bduin

Message:

Updated collection of datasets

File:

• prdatasets/pr_download_uci.m (modified) (7 diffs)

prdatasets/pr_download_uci.m

@@ -78 +78 @@
 
 %% if matfiles available, use them
-[varargout{:}] = loadmatfile(comname);
+[varargout{:}] = pr_loadmatfile(comname);
 if ~isempty(varargout{1}), return; end
 
@@ -102 +102 @@
     dataname = comname;
   end
-  opt{j}.dsetname = dataname;
+%   opt{j}.dsetname = dataname;
   savemat = ~isfield(opt{j},'matfile') || opt{j}.matfile;
   opt{j}.matfile  = false;
+  opt{j}.delimeter= ',';
+  opt{j} = fielddef(opt{j},'dsetname',callername);
   a = pr_download(data.url,fullfile(datadir,dataname),opt{j});
   a = setuser(a,data,'user'); % store dataset info
-  a = setname(a,dataname);    % set dataset name
+%   a = setname(a,dataname);    % set dataset name
   if ~isfield(opt{j},'labfeat') || isempty(opt{j}.labfeat)
     a = feat2lab(a,size(a,2));
@@ -120 +122 @@
 if numel(ucinames) > 1
   % multiple datasets loaded, alignment might be needed
-  [varargout{:}] = dset_align(varargout{:});
+  [varargout{:}] = pr_dset_align(varargout{:});
   a = vertcat(varargout{:});
   a = setuser(a,data,'user'); % store dataset info
-  a = setname(a,comname);    % set dataset name
+  opt{end} = fielddef(opt{end},'dsetname',callername);
   if ~isfield(opt{end},'matfile') || opt{end}.matfile
     save(fullfile(datadir,comname),'a');
@@ -167 +169 @@
     dataname = prname;
   end
-  filenames{j} = fullfile(thisdir,dataname);
+  filenames{j} = fullfile(fullfile(thisdir,'data'),dataname);
   if exist([filenames{j} '.mat'],'file') == 2
     % if mat-file is available, use it
@@ -174 +176 @@
     a = getfield(s,f{1});
   else
-    if ~exist('data')
+    if ~exist('data','var')
       % get UCI info
       data = parselink(name);
@@ -218 +220 @@
 if anynew && numel(ucinames) > 1
   % multiple datasets loaded, alignment might be needed
-  [varargout{:}] = dset_align(varargout{:});
+  [varargout{:}] = pr_dset_align(varargout{:});
   for j=1:numel(ucinames)
     a = varargout{j};
@@ -273 +275 @@
 data.type = type;
 
+function s = fielddef(s,field,x)
+  if ~isfield(s,field)
+    s.(field) = x;
+  end
 
 function name = callername(n)