# HG changeset patch
# User bengioy@bengiomac.local
# Date 1209866437 14400
# Node ID ccd6ae89a7c4c15fe4ae84f9630391b8d8f76a4b
# Parent  90e4c0784d6ee15734da4f667c2749da925276b4# Parent  b4159cbdc06b3eb26b3ad192d715a68cba9c1d4b
merge

diff -r 90e4c0784d6e -r ccd6ae89a7c4 dataset.py
--- a/dataset.py	Sat May 03 21:59:26 2008 -0400
+++ b/dataset.py	Sat May 03 22:00:37 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 90e4c0784d6e -r ccd6ae89a7c4 test_dataset.py
--- a/test_dataset.py	Sat May 03 21:59:26 2008 -0400
+++ b/test_dataset.py	Sat May 03 22:00:37 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()