# HG changeset patch # User Frederic Bastien # Date 1210711371 14400 # Node ID 1400fa04dfab224afdde340fc7e994e393024838 # Parent 136f785591384296974bb3c943553b679f3bd848 bugfix diff -r 136f78559138 -r 1400fa04dfab dataset.py --- a/dataset.py Tue May 13 16:02:32 2008 -0400 +++ b/dataset.py Tue May 13 16:42:51 2008 -0400 @@ -1179,9 +1179,11 @@ def next(self): function_inputs = self.input_iterator.next() if self.output_dataset.minibatch_mode: - function_outputs = self.output_dataset.function(*function_inputs) + outputs = self.output_dataset.function(*function_inputs) + assert all([hasattr(output,'__iter__') for output in outputs]) + function_outputs = [output[0] for output in outputs] else: - function_outputs = self.output_dataset.function(function_inputs) + function_outputs = self.output_dataset.function(*function_inputs) return Example(self.output_dataset.output_names,function_outputs) return ApplyFunctionSingleExampleIterator(self)