From d01f64da964f2f0b651ebb491aaa581f955b9089 Mon Sep 17 00:00:00 2001
From: Fabian Pedregosa <fabian.pedregosa@inria.fr>
Date: Wed, 17 Mar 2010 13:29:43 +0000
Subject: [PATCH] Dataset refactoring.
From: Fabian Pedregosa <fabian.pedregosa@inria.fr>
git-svn-id: https://scikit-learn.svn.sourceforge.net/svnroot/scikit-learn/trunk@556 22fbfee3-77ab-4535-9bad-27d1bd3bc7d8
---
scikits/learn/datasets/base.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/scikits/learn/datasets/base.py b/scikits/learn/datasets/base.py
index a92f85f73c..10388b3050 100644
--- a/scikits/learn/datasets/base.py
+++ b/scikits/learn/datasets/base.py
@@ -48,18 +48,17 @@ def load(dataset):
"""
import csv
import os
- DESCR = ''
firis = csv.reader(open(os.path.dirname(__file__) + '/data/%s.csv' % dataset))
fdescr = open(os.path.dirname(__file__) + '/descr/%s.rst' % dataset)
temp = firis.next()
nsamples = int(temp[0])
nfeat = int(temp[1])
- labelnames = temp[2:]
+ targetnames = temp[2:]
data = np.empty((nsamples, nfeat))
- label = np.empty((nsamples,))
+ target = np.empty((nsamples,))
for i, ir in enumerate(firis):
data[i] = np.asanyarray(ir[:-1], dtype=np.float)
- label[i] = np.asanyarray(ir[-1], dtype=np.int)
- return Bunch(data = data, label=label, labelnames=labelnames, DESCR=fdescr.read())
+ target[i] = np.asanyarray(ir[-1], dtype=np.float)
+ return Bunch(data = data, target=target, targetnames=targetnames, DESCR=fdescr.read())
--
GitLab