From 82e5b4728948be06b356e2418e4be3001b5bc953 Mon Sep 17 00:00:00 2001
From: Fabian Pedregosa <fabian.pedregosa@inria.fr>
Date: Thu, 18 Mar 2010 14:21:23 +0000
Subject: [PATCH] Update benchmarks
From: Fabian Pedregosa <fabian.pedregosa@inria.fr>
git-svn-id: https://scikit-learn.svn.sourceforge.net/svnroot/scikit-learn/trunk@567 22fbfee3-77ab-4535-9bad-27d1bd3bc7d8
---
scikits/learn/benchmarks/bench_svm.py | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/scikits/learn/benchmarks/bench_svm.py b/scikits/learn/benchmarks/bench_svm.py
index ed9ef1de31..6c966e57da 100644
--- a/scikits/learn/benchmarks/bench_svm.py
+++ b/scikits/learn/benchmarks/bench_svm.py
@@ -31,14 +31,14 @@ def bench_scikit(X, Y, T):
bench with scikit-learn bindings on libsvm
"""
import scikits.learn
- from scikits.learn.svm import SVM
+ from scikits.learn.svm import SVC
gc.collect()
# start time
tstart = datetime.now()
- clf = scikits.learn.svm.SVM(kernel='linear', scale=False);
+ clf = scikits.learn.svm.SVC(kernel='linear');
clf.fit(X, Y);
Z = clf.predict(T)
delta = (datetime.now() - tstart)
@@ -93,14 +93,17 @@ def bench_pymvpa(X, Y, T):
if __name__ == '__main__':
- from scikits.learn.datasets.iris import load
- SP, SW, PL, PW, LABELS = load()
- X = np.c_[SP, SW, PL, PW]
- Y = LABELS
+ from scikits.learn.datasets import load
+ iris = load('iris')
+ X = iris.data
+ Y = iris.target
n = 100
step = 100
for i in range(n):
+ print '============================================'
+ print 'Entering iteration %s of %s' % (i, n)
+ print '============================================'
T = np.random.randn(step*i, 4)
bench_scikit(X, Y, T)
bench_pymvpa(X, Y, T)
@@ -136,7 +139,7 @@ if __name__ == '__main__':
dimension = start_dim
for i in range(0, n):
print '============================================'
- print 'Entering iteration %s' % i
+ print 'Entering iteration %s of %s' % (i, n)
print '============================================'
dimension += step
X, Y = sparse_uncorrelated(nb_features=dimension, nb_samples=100)
--
GitLab