Changeset 129

Timestamp:

04/18/19 20:39:46 (6 years ago)

Author:

bduin

Message:

 

Location:

prdatasets

Files:

• iris.m (modified) (1 diff)
• pr_dataset.m (modified) (1 diff)
• pr_getdata.m (modified) (1 diff)
• twonorm.m (modified) (1 diff)
• x80.m (modified) (1 diff)

prdatasets/iris.m

@@ -5 +5 @@
 % Iris plants dataset by R.A.Fisher, 150 objects, 4 features, 3
 % classes.
-function x = iris;
+function x = iris
 
 prdatasets(mfilename,1,'http://prtools.tudelft.nl/prdatasets/iris.dat');

prdatasets/pr_dataset.m

@@ -4 +4 @@
 
 varargout = cell(1,nargout);
+name = varargin{1};
+if ischar(name)
+  if isempty(fileparts(name))
+    dirr = fileparts(which(callername));
+    name = fullfile(dirr,name);
+    varargin{1} = name;
+  end
+end   
 if floor(prversion) == 4
   [varargout{:}] = dataset(varargin{:});

prdatasets/pr_getdata.m

@@ -34 +34 @@
 %  dset  : becomes full path and name of dataset
 %  ddir  : becomes full path of dataset
+
 name = callername;
 argin = setdefaults(varargin,[],[],[],[],true);

prdatasets/twonorm.m

@@ -20 +20 @@
 
 prdatasets(mfilename,1);
-a = pr_dataset('twonorm');
+dsetname = which(mfilename);
+a = pr_dataset(dsetname(1,1:end-2));
 a = setname(a,'Twonorm Data');
 

prdatasets/x80.m

@@ -24 +24 @@
 function a = x80;
 
+global ASK
 prdatasets('80x',1);
 a = pr_dataset('80x');