Changeset 446

Timestamp:

07/21/07 08:02:46 (5 years ago)

Author:

cdavid

Message:

Set correct name for datasets packages (data->datasets) in the setup, and trivial changes in datasets info message

Location:

trunk/learn/scikits/learn

Files:

• datasets/setup.py (modified) (1 diff)
• utils/attrselect.py (modified) (5 diffs)

trunk/learn/scikits/learn/datasets/setup.py

@@ -3 +3 @@
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
-    config = Configuration('data',parent_package,top_path)
+    config = Configuration('datasets',parent_package,top_path)
     config.add_subpackage('oldfaithful')
     config.add_subpackage('pendigits')

trunk/learn/scikits/learn/utils/attrselect.py

@@ -1 +1 @@
 #! /usr/bin/env python
-# Last Change: Sat Jul 21 07:00 PM 2007 J
+# Last Change: Sat Jul 21 09:00 PM 2007 J
 
 """This module implements function to extract attributes and/or classes from
@@ -9 +9 @@
     # Attributes info
     attr = get_attributes(data)
-    msg = "data Iris has: \n" + "\t%d attributes: " % len(attr)
+    msg = "data has: \n" + "\t%d attributes: " % len(attr)
     if len(attr) > 0:
         msg += ", ".join([i for i in attr[:-1]])
@@ -21 +21 @@
                 msg += "\t%d classes: " % len(cl)
                 msg += ", ".join([i for i in cl])
-        else:
-            msg += "\tNo classes"
+    else:
+        msg += "\tNo classes"
 
-        msg += '\n'
-        # Number of samples
-        ns = len(data)
-        msg += "\t%d samples in the dataset:\n" % ns
+    msg += '\n'
+
+    # Number of samples
+    ns = len(data)
+    if label is not None:
         if cl is not None and len(cl) > 0:
+            msg += "\t%d samples in the dataset:\n" % ns
             c2ind = get_c2ind(cl, label)
             msg += "".join(["\t\t%d samples for class %s\n" \
                               % (len(c2ind[cname]), cname) \
                               for cname in cl])
+    else:
+        msg += "\t%d samples in the dataset\n" % ns
 
     print msg
@@ -90 +94 @@
 
 if __name__ == '__main__':
-    from scikits.learn.datasets import iris, german
+    from scikits.learn.datasets import iris, german, pendigits, oldfaithful
     d = iris.load()
     data, lab, cl = d['data'], d['label'], d['class']
@@ -98 +102 @@
     data, lab, cl = d['data'], d['label'], d['class']
     print_dataset_info(data, lab, cl)
+
+    d = oldfaithful.load()
+    data = d['data']
+    print_dataset_info(data)
+
+    d = pendigits.load()
+    data, lab, cl = d['data'], d['label'], d['class']
+    print_dataset_info(data, lab, cl)