# HG changeset patch
# User Yoshua Bengio <bengioy@iro.umontreal.ca>
# Date 1269214205 14400
# Node ID a92ec9939e4f7b7f16cd3cb73f59f4b3e0dc1cfc
# Parent  d41fe003fade86aeb78cebfeb80788db0eee9fae
fixed a problem with maxsize when not provided

diff -r d41fe003fade -r a92ec9939e4f baseline/log_reg/log_reg.py
--- a/baseline/log_reg/log_reg.py	Sat Mar 20 15:49:55 2010 -0400
+++ b/baseline/log_reg/log_reg.py	Sun Mar 21 19:30:05 2010 -0400
@@ -142,7 +142,7 @@
 #--------------------------------------------------------------------------------------------------------------------
 
 def log_reg( learning_rate = 0.13, nb_max_examples =1000000, batch_size = 50, \
-                    dataset=datasets.nist_digits, image_size = 32 * 32, nb_class = 10,  \
+                    dataset=datasets.nist_digits(), image_size = 32 * 32, nb_class = 10,  \
                     patience = 5000, patience_increase = 2, improvement_threshold = 0.995):
     
     #28 * 28 = 784
diff -r d41fe003fade -r a92ec9939e4f datasets/ftfile.py
--- a/datasets/ftfile.py	Sat Mar 20 15:49:55 2010 -0400
+++ b/datasets/ftfile.py	Sun Mar 21 19:30:05 2010 -0400
@@ -201,7 +201,9 @@
         set.
         """
         if valid_data is None:
-            total_valid_size = min(sum(FTFile(td).size for td in test_data), maxsize)
+            total_valid_size = sum(FTFile(td).size for td in test_data)
+            if maxsize is not None:
+                total_valid_size = min(total_valid_size, maxsize) 
             valid_size = total_valid_size/len(train_data)
             self._train = FTData(train_data, train_lbl, size=-valid_size,
                                  inscale=inscale, outscale=outscale,