Changeset 137 for prdatasets/iris.m

Timestamp:

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

Author:

bduin

Message:

 

Location:

prdatasets

Files:

• . (modified) (1 prop)
• iris.m (modified) (1 diff)

prdatasets

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

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

prdatasets/iris.m

@@ -5 +5 @@
 % Iris plants dataset by R.A.Fisher, 150 objects, 4 features, 3
 % classes.
-function x = iris;
 
-prdatasets(mfilename,1,'http://prtools.tudelft.nl/prdatasets/iris.dat');
-user.desc = 'Iris Plant database from UCI. A classic dataset in the pattern recognition literature.  The original dataset is a multiclass classification problem, introduced by R.A. Fisher, The use of multiple measurements in taxonomic problems. Ann Eugenics, 7:179--188, 1936.';
-user.link = 'ftp://ftp.ics.uci.edu/pub/machine-learning-databases/iris/';
-cl = {'Iris-setosa' 'Iris-versicolor' 'Iris-virginica'};
-fl = {'sepal length' 'sepal width' 'petal length' 'petal width'};
+function a = iris
 
-% the fuzzy toolbox has a iris.dat file too, avoid it
-pp = fileparts(which(mfilename));
-a = load(fullfile(pp,'iris.dat'));
-x = pr_dataset(a(:,1:(end-1)), cl(a(:,end)));
-x = setfeatlab(x,fl);
-x = setuser(x,user);
-x = setname(x,'Iris');
+a = pr_loadmatfile;
+if isempty(a)
+  opt.labfeat    = 5;
+  opt.featnames  = {'sepal length' 'sepal width' 'petal length' 'petal width'};
+  opt.classnames = {'Iris-setosa' 'Iris-versicolor' 'Iris-virginica'};
+  opt.desc       = 'Iris Plant database from UCI. A classic dataset in the pattern recognition literature.  The original dataset is a multiclass classification problem, introduced by R.A. Fisher, The use of multiple measurements in taxonomic problems. Ann Eugenics, 7:179--188, 1936.';
+  opt.link       = 'ftp://ftp.ics.uci.edu/pub/machine-learning-databases/iris/';
+  opt.dsetname   = 'Iris';
+  a = pr_download('http://prtools.tudelft.nl/prdatasets/iris.dat',[],opt);
+end
 
 return

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