diff --git a/scikits/learn/datasets/base.py b/scikits/learn/datasets/base.py index a92f85f73c7745e2a6db3894c4d34b2bc8ffa36c..10388b30501cce8a3358f5e46e3c57d9c38c2029 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())