# HG changeset patch # User Frederic Bastien # Date 1213651070 14400 # Node ID 7d4792fc28ae86ea4307abd844f3ef8d20825e0e # Parent 5e38ed2b3a75e9790406c715fa77c14c276d5bdd# Parent 0ce6e62ac6e566cbcf9002b314d80d0b1898972d Automated merge with ssh://projects@lgcm.iro.umontreal.ca/hg/pylearn diff -r 0ce6e62ac6e5 -r 7d4792fc28ae dataset.py --- a/dataset.py Mon Jun 16 17:07:44 2008 -0400 +++ b/dataset.py Mon Jun 16 17:17:50 2008 -0400 @@ -388,6 +388,8 @@ assert offset >= 0 assert offset < len(self) assert offset + minibatch_size -1 < len(self) + if fieldnames == None : + fieldnames = self.fieldNames() return self.minibatches_nowrap(fieldnames,minibatch_size,n_batches,offset) def minibatches_nowrap(self,fieldnames,minibatch_size,n_batches,offset):