changeset 430:c096e2820131

merge
author Yoshua Bengio <bengioy@iro.umontreal.ca>
date Tue, 29 Jul 2008 09:36:09 -0400
parents 2bde0bed1919 (current diff) 52b4908d8971 (diff)
children 0f8c81b0776d
files
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/dataset.py	Fri Jul 25 17:02:28 2008 -0400
+++ b/dataset.py	Tue Jul 29 09:36:09 2008 -0400
@@ -1454,12 +1454,14 @@
         (it takes minibatches of inputs and produces minibatches of outputs, as
         documented in the class comment).
 
-        TBM: are filedtypes the old field types (from input_dataset) or the new ones
+        TBM: are fieldtypes the old field types (from input_dataset) or the new ones
         (for the new dataset created)?
         """
         self.input_dataset=input_dataset
         self.function=function
         self.output_names=output_names
+        #print 'self.output_names in afds:', self.output_names
+        #print 'length in afds:', len(self.output_names)
         self.minibatch_mode=minibatch_mode
         DataSet.__init__(self,description,fieldtypes)
         self.valuesHStack = values_hstack if values_hstack else input_dataset.valuesHStack
@@ -1484,9 +1486,10 @@
                                     for input_example in input_examples]
                 all_output_fields = zip(*output_examples)
 
+            #print 'output_names=', self.output_names
+            #print 'all_output_fields', all_output_fields
+            #print 'len(all_output_fields)=', len(all_output_fields)
             all_outputs = Example(self.output_names, all_output_fields)
-            #print 'input_fields', input_fields
-            #print 'all_outputs', all_outputs
             if fieldnames==self.output_names:
                 rval = all_outputs
             else:
--- a/lookup_list.py	Fri Jul 25 17:02:28 2008 -0400
+++ b/lookup_list.py	Tue Jul 29 09:36:09 2008 -0400
@@ -29,6 +29,10 @@
     U{http://epydoc.sourceforge.net/manual-epytext.html#doctest-blocks}
     """
     def __init__(self,names=[],values=[]):
+        #print 'values=', values
+        #print 'length=', len(values)
+        #print 'names=', names
+        #print 'length=',len(names)
         assert len(values)==len(names)
         self.__dict__['_values']=values
         self.__dict__['_name2index']={}