Mercurial > pylearn

changeset 140:488ad6398b12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfix
author Frederic Bastien <bastienf@iro.umontreal.ca>
date Mon, 12 May 2008 14:13:19 -0400
parents 0c6fec172ae1
children f5f235bebee4
files dataset.py
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/dataset.py	Mon May 12 14:11:57 2008 -0400
+++ b/dataset.py	Mon May 12 14:13:19 2008 -0400
@@ -765,12 +765,16 @@
                 return self
             def next(self):
                 # concatenate all the fields of the minibatches
+                l=LookupList()
+                for iter in self.iterators:
+                    l.append_lookuplist(iter.next())
+                return l
                 return reduce(LookupList.__add__,[iterator.next() for iterator in self.iterators])
                                      
         assert self.hasFields(*fieldnames)
         # find out which underlying datasets are necessary to service the required fields
         # and construct corresponding minibatch iterators
-        if fieldnames:
+        if fieldnames and fieldnames!=self.fieldNames():
             datasets=set([])
             fields_in_dataset=dict([(dataset,[]) for dataset in datasets])
             for fieldname in fieldnames: