From 898e32fa049771c641a94017ea826281a11e2a21 Mon Sep 17 00:00:00 2001
From: Fabian Pedregosa <fabian.pedregosa@inria.fr>
Date: Tue, 5 Jan 2010 13:40:01 +0000
Subject: [PATCH] Flatten oldfaithful
From: cdavid <cdavid@cb17146a-f446-4be1-a4f7-bd7c5bb65646>
git-svn-id: https://scikit-learn.svn.sourceforge.net/svnroot/scikit-learn/trunk@15 22fbfee3-77ab-4535-9bad-27d1bd3bc7d8
---
scikits/learn/datasets/oldfaithful/data.py | 2 +-
.../learn/datasets/oldfaithful/oldfaithful.py | 99 +++++++++----------
.../learn/datasets/oldfaithful/src/convert.py | 17 +---
3 files changed, 51 insertions(+), 67 deletions(-)
diff --git a/scikits/learn/datasets/oldfaithful/data.py b/scikits/learn/datasets/oldfaithful/data.py
index 8aaaa6c8eb..d71bbaf600 100644
--- a/scikits/learn/datasets/oldfaithful/data.py
+++ b/scikits/learn/datasets/oldfaithful/data.py
@@ -89,4 +89,4 @@ def load():
[('duration', '|S5'), ('waiting', 'int')])
data['waiting'] = waiting
data['duration'] = duration
- return data
+ return {'data': data}
diff --git a/scikits/learn/datasets/oldfaithful/oldfaithful.py b/scikits/learn/datasets/oldfaithful/oldfaithful.py
index e409b7b58f..d798b12e08 100644
--- a/scikits/learn/datasets/oldfaithful/oldfaithful.py
+++ b/scikits/learn/datasets/oldfaithful/oldfaithful.py
@@ -1,54 +1,45 @@
-duration = [ '241', '129', 'L', 'L', 'L', 'S', '263', '257', '122', '290',
- '110', '327', '97', '292', '263', '106', '280', 'S', '284', '253',
- '114', '298', 'S', 'L', 'S', 'L', '170', '270', '244', '223', '211',
- '268', '133', '293', '156', '249', '132', '286', '110', '276', '136',
- '248', 'S', 'L', 'S', 'L', '113', '256', '125', '268', '133', '240',
- '106', '260', '131', '269', '233', '200', '224', '240', '117', '316',
- 'S', 'L', 'S', 'L', 'S', 'L', '212', '130', '270', '121', '249', '252',
- '260', '116', '279', '229', '242', '250', '280', '109', 'L', 'M', 'L',
- 'S', '267', '123', '255', '115', '280', '104', '263', '106', '276',
- '112', '267', '98', '302', '109', '306', '98', '257', 'S', 'L', 'S',
- '272', '120', 'L', '176', '284', '234', '117', '247', '108', '280',
- '110', '282', '127', '287', '109', '246', '279', 'L', 'S', 'L', 'L',
- '253', '248', '236', '225', '265', '148', '250', '228', '259', '232',
- '281', '102', '298', '256', '275', 'L', 'L', 'L', 'L', '119', '276',
- '50', '295', '104', '275', '102', '285', '110', '270', '112', '267',
- '267', '240', '288', 'L', 'L', 'S', 'L', '116', '275', '120', '222',
- '172', '290', '207', '263', '108', '264', '149', '271', '126', '261',
- '262', '107', '295', '109', 'L', 'L', 'L', '232', '111', '282', '121',
- '268', '112', '250', '114', '255', '195', '253', '113', '299', '111',
- '240', '118', '286', 'L', 'S', 'L', 'L', '143', '265', '253', '262',
- '120', '267', '105', '270', '97', '282', '154', '222', '254', '116',
- '261', 'L', 'L', 'L', '253', '240', '248', '113', '268', '117', '253',
- '103', '267', '255', '238', '263', '118', '267', '256', '115', '265',
- 'M', 'L', 'S', 'L', '197', '110', '277', '110', '277', '276', '255',
- '116', '299', '118', '258', '252', '272', '264', '277', 'S', 'L', 'L',
- '235', 'S', '270', '108', '240', '165', '284', '238', '117', '298',
- '111', '288', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'S', 'L', '116',
- '260', '100', '286', '117', '281', '116', '265', '128', '245', '124',
- 'L', 'L', 'S']
-waiting = [ 4800, 4260, 3420, 4800, 4500, 4620, 3600, 5160, 4620, 3360, 4860,
- 3000, 5340, 3240, 5400, 4380, 3600, 4980, 3900, 4920, 5040, 3240, 5100,
- 3480, 4740, 3420, 5280, 4080, 4560, 4680, 4440, 5100, 4500, 3900, 4560,
- 3480, 5460, 3000, 5220, 2880, 5580, 3240, 5160, 3180, 4680, 3120, 4980,
- 3600, 5220, 2940, 4800, 3600, 5520, 2580, 5340, 3600, 5040, 4140, 4440,
- 4260, 6480, 3000, 4620, 3420, 4800, 3660, 4920, 2880, 4860, 4380, 3720,
- 4740, 3240, 4800, 4380, 4860, 3720, 4860, 4260, 4740, 4860, 4440, 3540,
- 4860, 3960, 5220, 3180, 4800, 3000, 5220, 3060, 4920, 3480, 4860, 2940,
- 5520, 3000, 5280, 3720, 5580, 3360, 5340, 3060, 4740, 3480, 4920, 3120,
- 5280, 3120, 4680, 4140, 4500, 4620, 3180, 4800, 3300, 5220, 3180, 5100,
- 3660, 5580, 3240, 4560, 4800, 4860, 3540, 5160, 4680, 4260, 4620, 4560,
- 5640, 4500, 3000, 4980, 4920, 4320, 4620, 4500, 3900, 4740, 4320, 4680,
- 4620, 4740, 4500, 4680, 3840, 4800, 2940, 5280, 3240, 5100, 3060, 5760,
- 3000, 4800, 4680, 4860, 4320, 4500, 4680, 5220, 4140, 3300, 4980, 2940,
- 4920, 3420, 5040, 3420, 5040, 4380, 4680, 3420, 4740, 3420, 5400, 3720,
- 5220, 4680, 3120, 5880, 2880, 4680, 4740, 3900, 5040, 3000, 4980, 3600,
- 4800, 3000, 5280, 3000, 5040, 4440, 4560, 3900, 5340, 2940, 5280, 3060,
- 4680, 5100, 3900, 4500, 4620, 4140, 5520, 4080, 5220, 3660, 4860, 3300,
- 5580, 3180, 5040, 4200, 4380, 5580, 3000, 5220, 4620, 4440, 4320, 4920,
- 4440, 4800, 2940, 5460, 3180, 5160, 2940, 4740, 5340, 5220, 4560, 3540,
- 4800, 5340, 2700, 5580, 4320, 4260, 3240, 4740, 4440, 3900, 4680, 3420,
- 5220, 4320, 5040, 2820, 5040, 3420, 5220, 4080, 5160, 4500, 4380, 3180,
- 4920, 5580, 4620, 3240, 5760, 2880, 5340, 3780, 5040, 4560, 3720, 4980,
- 3000, 5100, 4680, 4680, 4860, 4680, 4560, 4440, 4860, 3960, 5040, 2880,
- 5580, 2820, 5220, 3060, 4680, 3240, 5220, 3120, 5100, 3480, 5280, 4740]
+duration = [241, 129, 'L', 'L', 'L', 'S', 263, 257, 122, 290, 110, 327, 97,
+292, 263, 106, 280, 'S', 284, 253, 114, 298, 'S', 'L', 'S', 'L', 170, 270, 244,
+223, 211, 268, 133, 293, 156, 249, 132, 286, 110, 276, 136, 248, 'S', 'L', 'S',
+'L', 113, 256, 125, 268, 133, 240, 106, 260, 131, 269, 233, 200, 224, 240, 117,
+316, 'S', 'L', 'S', 'L', 'S', 'L', 212, 130, 270, 121, 249, 252, 260, 116, 279,
+229, 242, 250, 280, 109, 'L', 'M', 'L', 'S', 267, 123, 255, 115, 280, 104, 263,
+106, 276, 112, 267, 98, 302, 109, 306, 98, 257, 'S', 'L', 'S', 272, 120, 'L',
+176, 284, 234, 117, 247, 108, 280, 110, 282, 127, 287, 109, 246, 279, 'L', 'S',
+'L', 'L', 253, 248, 236, 225, 265, 148, 250, 228, 259, 232, 281, 102, 298, 256,
+275, 'L', 'L', 'L', 'L', 119, 276, 50, 295, 104, 275, 102, 285, 110, 270, 112,
+267, 267, 240, 288, 'L', 'L', 'S', 'L', 116, 275, 120, 222, 172, 290, 207, 263,
+108, 264, 149, 271, 126, 261, 262, 107, 295, 109, 'L', 'L', 'L', 232, 111, 282,
+121, 268, 112, 250, 114, 255, 195, 253, 113, 299, 111, 240, 118, 286, 'L', 'S',
+'L', 'L', 143, 265, 253, 262, 120, 267, 105, 270, 97, 282, 154, 222, 254, 116,
+261, 'L', 'L', 'L', 253, 240, 248, 113, 268, 117, 253, 103, 267, 255, 238, 263,
+118, 267, 256, 115, 265, 'M', 'L', 'S', 'L', 197, 110, 277, 110, 277, 276, 255,
+116, 299, 118, 258, 252, 272, 264, 277, 'S', 'L', 'L', 235, 'S', 270, 108, 240,
+165, 284, 238, 117, 298, 111, 288, 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'S', 'L',
+116, 260, 100, 286, 117, 281, 116, 265, 128, 245, 124, 'L', 'L', 'S']
+
+waiting = [4800, 4260, 3420, 4800, 4500, 4620, 3600, 5160, 4620, 3360, 4860,
+3000, 5340, 3240, 5400, 4380, 3600, 4980, 3900, 4920, 5040, 3240, 5100, 3480,
+4740, 3420, 5280, 4080, 4560, 4680, 4440, 5100, 4500, 3900, 4560, 3480, 5460,
+3000, 5220, 2880, 5580, 3240, 5160, 3180, 4680, 3120, 4980, 3600, 5220, 2940,
+4800, 3600, 5520, 2580, 5340, 3600, 5040, 4140, 4440, 4260, 6480, 3000, 4620,
+3420, 4800, 3660, 4920, 2880, 4860, 4380, 3720, 4740, 3240, 4800, 4380, 4860,
+3720, 4860, 4260, 4740, 4860, 4440, 3540, 4860, 3960, 5220, 3180, 4800, 3000,
+5220, 3060, 4920, 3480, 4860, 2940, 5520, 3000, 5280, 3720, 5580, 3360, 5340,
+3060, 4740, 3480, 4920, 3120, 5280, 3120, 4680, 4140, 4500, 4620, 3180, 4800,
+3300, 5220, 3180, 5100, 3660, 5580, 3240, 4560, 4800, 4860, 3540, 5160, 4680,
+4260, 4620, 4560, 5640, 4500, 3000, 4980, 4920, 4320, 4620, 4500, 3900, 4740,
+4320, 4680, 4620, 4740, 4500, 4680, 3840, 4800, 2940, 5280, 3240, 5100, 3060,
+5760, 3000, 4800, 4680, 4860, 4320, 4500, 4680, 5220, 4140, 3300, 4980, 2940,
+4920, 3420, 5040, 3420, 5040, 4380, 4680, 3420, 4740, 3420, 5400, 3720, 5220,
+4680, 3120, 5880, 2880, 4680, 4740, 3900, 5040, 3000, 4980, 3600, 4800, 3000,
+5280, 3000, 5040, 4440, 4560, 3900, 5340, 2940, 5280, 3060, 4680, 5100, 3900,
+4500, 4620, 4140, 5520, 4080, 5220, 3660, 4860, 3300, 5580, 3180, 5040, 4200,
+4380, 5580, 3000, 5220, 4620, 4440, 4320, 4920, 4440, 4800, 2940, 5460, 3180,
+5160, 2940, 4740, 5340, 5220, 4560, 3540, 4800, 5340, 2700, 5580, 4320, 4260,
+3240, 4740, 4440, 3900, 4680, 3420, 5220, 4320, 5040, 2820, 5040, 3420, 5220,
+4080, 5160, 4500, 4380, 3180, 4920, 5580, 4620, 3240, 5760, 2880, 5340, 3780,
+5040, 4560, 3720, 4980, 3000, 5100, 4680, 4680, 4860, 4680, 4560, 4440, 4860,
+3960, 5040, 2880, 5580, 2820, 5220, 3060, 4680, 3240, 5220, 3120, 5100, 3480,
+5280, 4740]
+
diff --git a/scikits/learn/datasets/oldfaithful/src/convert.py b/scikits/learn/datasets/oldfaithful/src/convert.py
index e78f15a06b..f31211f921 100755
--- a/scikits/learn/datasets/oldfaithful/src/convert.py
+++ b/scikits/learn/datasets/oldfaithful/src/convert.py
@@ -1,8 +1,9 @@
#! /usr/bin/env python
-# Last Change: Fri Jun 08 11:00 AM 2007 J
+# Last Change: Tue Jul 17 04:00 PM 2007 J
# This script generates a python file from the txt data
import csv
+from scikits.learn.datasets.misc import dumpvar
dataname = 'Oldfaithful.txt'
f = open(dataname, 'r')
@@ -29,15 +30,7 @@ for i in range(len(duration)):
waiting2 = [int(i) * 60 for i in waiting]
# Write the data in oldfaitful.py
-a = open("oldfaithful.py", "w")
+a = open("../oldfaithful.py", "w")
-a.write("duration = [\n")
-for i in range(len(duration2) - 1):
- a.write("'%s', " % duration2[i])
-a.write("'%s']\n" % duration2[-1])
-
-a.write("waiting = [\n")
-for i in range(len(waiting2) - 1):
- a.write("%s, " % waiting2[i])
-a.write("%s]\n" % waiting2[-1])
-a.close()
+a.writelines(dumpvar(duration2, 'duration'))
+a.writelines(dumpvar(waiting2, 'waiting'))
--
GitLab