# HG changeset patch
# User gdesjardins
# Date 1292886528 18000
# Node ID 124b939d997f75b924ef748dedad60ac6a011ab6
# Parent  746ebceeb46f25eb53b7fb0d61fe1ed360ea1216
* removed temporary caltech_silhouette2 dataset
* minor tweak to peaked_modes dataset (used for tempering stuff)

diff -r 746ebceeb46f -r 124b939d997f pylearn/datasets/caltech.py
--- a/pylearn/datasets/caltech.py	Mon Dec 20 18:08:04 2010 -0500
+++ b/pylearn/datasets/caltech.py	Mon Dec 20 18:08:48 2010 -0500
@@ -27,20 +27,3 @@
     rval.img_shape = (28,28)
 
     return rval
-
-def caltech_silhouette2():
-
-    rval = Dataset()
-
-    from scipy import io 
-    path = '/data/lisa6/desjagui/caltech101_silhouettes_28_split1.mat'
-
-    data = io.loadmat(open(path,'r'))
-
-    rval.train = Dataset.Obj(x=data['train_data'], y=data['train_labels'])
-    rval.valid = Dataset.Obj(x=data['val_data'],   y=data['val_labels'])
-    rval.test  = Dataset.Obj(x=data['test_data'],  y=data['test_labels'])
-    rval.n_classes = 101
-    rval.img_shape = (28,28)
-
-    return rval
diff -r 746ebceeb46f -r 124b939d997f pylearn/datasets/test_modes.py
--- a/pylearn/datasets/test_modes.py	Mon Dec 20 18:08:04 2010 -0500
+++ b/pylearn/datasets/test_modes.py	Mon Dec 20 18:08:48 2010 -0500
@@ -131,9 +131,11 @@
 
         for bi, mode in enumerate(modes):
             mi, = numpy.where(mode != 0)
+            modes_i.append(mi)
             bitflip = self.rng.binomial(1,self.p[mi], size=(1, self.img_size))
             data[bi] = numpy.abs(self.modes[mi] - bitflip)
 
         self.data = data
+        self.data_modes = modes_i
 
         return data