# HG changeset patch
# User Yoshua Bengio <bengioy@iro.umontreal.ca>
# Date 1277149650 14400
# Node ID a75bf0aca18f9ae34c29c02723d17512bfb812b8
# Parent  daa355332b6601628426e8c498fc5e49a2cf8a5d# Parent  d15e4f803622f067a0ec47ade2cf140a4502cbb6
merge

diff -r daa355332b66 -r a75bf0aca18f pylearn/datasets/miniblocks.py
--- a/pylearn/datasets/miniblocks.py	Mon Jun 21 15:47:12 2010 -0400
+++ b/pylearn/datasets/miniblocks.py	Mon Jun 21 15:47:30 2010 -0400
@@ -5,7 +5,7 @@
 
 from pylearn.datasets import Dataset
 
-def miniblocks(reweight=None):
+def miniblocks(reweight=None, use_inverse=False):
     # If 'reweight' is not None, then it is an integer N such that each
     # sample is duplicated k times, with k taken uniformly in {1, 2, ..., N}.
     # Some adjustment is made to ensure the dataset size is a multiple of its
@@ -50,6 +50,7 @@
     set = Dataset()
     set.train = Dataset.Obj(x = input, y = target)
     set.test = Dataset.Obj(x = input, y = target)
+    set.img_shape = (4,4)
 
     return set
 
diff -r daa355332b66 -r a75bf0aca18f pylearn/datasets/peaked_modes.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pylearn/datasets/peaked_modes.py	Mon Jun 21 15:47:30 2010 -0400
@@ -0,0 +1,1 @@
+test_modes.py
\ No newline at end of file