# HG changeset patch # User Yoshua Bengio # Date 1209840062 14400 # Node ID b4159cbdc06b3eb26b3ad192d715a68cba9c1d4b # Parent 69f97aad3faff94a98097607f96d39987191e97e Fixed errors raised by test_dataset diff -r 69f97aad3faf -r b4159cbdc06b dataset.py --- a/dataset.py Sat May 03 14:29:56 2008 -0400 +++ b/dataset.py Sat May 03 14:41:02 2008 -0400 @@ -229,7 +229,7 @@ self.next_row -= self.L return DataSetFields(MinibatchDataSet(minibatch,self.dataset.valuesVStack, self.dataset.valuesHStack), - minibatch.keys())) + minibatch.keys()) minibatches_fieldnames = None @@ -348,7 +348,7 @@ """ Return a DataSetFields object associated with this dataset. """ - return DataSetFields(self,*fieldnames) + return DataSetFields(self,fieldnames) def __getitem__(self,i): """ @@ -548,7 +548,7 @@ the syntax used for DataSets, the | concatenates the fields and the & concatenates the examples. """ - def __init__(self,dataset,*fieldnames): + def __init__(self,dataset,fieldnames): original_dataset=dataset if not fieldnames: fieldnames=dataset.fieldNames() @@ -1033,7 +1033,7 @@ the input_dataset.values{H,V}Stack functions are used by default. """ def __init__(self,input_dataset,function,output_names,minibatch_mode=True, - values_hstack=None,values_vstack, + values_hstack=None,values_vstack=None, description=None,fieldtypes=None): """ Constructor takes an input dataset that has as many fields as the function diff -r 69f97aad3faf -r b4159cbdc06b test_dataset.py --- a/test_dataset.py Sat May 03 14:29:56 2008 -0400 +++ b/test_dataset.py Sat May 03 14:41:02 2008 -0400 @@ -109,6 +109,6 @@ #* ds1 | ds2 | ds3 == ds.hstack([ds1,ds2,ds3]) #* ds1 & ds2 & ds3 == ds.vstack([ds1,ds2,ds3]) - +test1() test_ArrayDataSet()