Mercurial > pylearn
comparison dataset.py @ 332:dada08a6adb8
redone my previous hack in MinibatchToSingleExampleIterator, tests should work again
author | Thierry Bertin-Mahieux <bertinmt@iro.umontreal.ca> |
---|---|
date | Mon, 16 Jun 2008 16:44:11 -0400 |
parents | 52aa031e1fe3 |
children | 7d2f7b8fe213 a0f150a33b0f |
comparison
equal
deleted
inserted
replaced
331:52aa031e1fe3 | 332:dada08a6adb8 |
---|---|
240 def next(self): | 240 def next(self): |
241 size1_minibatch = self.minibatch_iterator.next() | 241 size1_minibatch = self.minibatch_iterator.next() |
242 if not self.minibatch: | 242 if not self.minibatch: |
243 names = size1_minibatch.keys() | 243 names = size1_minibatch.keys() |
244 # next lines are a hack, but there was problem when we were getting [array(327)] for instance | 244 # next lines are a hack, but there was problem when we were getting [array(327)] for instance |
245 if len(size1_minibatch.values()[0].shape) > 0 : | 245 try: |
246 values = [value[0] for value in size1_minibatch.values()] | 246 values = [value[0] for value in size1_minibatch.values()] |
247 else : | 247 except : |
248 values = [value for value in size1_minibatch.values()] | 248 values = [value for value in size1_minibatch.values()] |
249 self.minibatch = Example(names,values) | 249 self.minibatch = Example(names,values) |
250 else: | 250 else: |
251 self.minibatch._values = [value[0] for value in size1_minibatch.values()] | 251 self.minibatch._values = [value[0] for value in size1_minibatch.values()] |
252 return self.minibatch | 252 return self.minibatch |