--- a/test_dataset.py	Tue Apr 29 17:45:16 2008 -0400
+++ b/test_dataset.py	Thu May 01 16:19:31 2008 -0400
@@ -23,4 +23,63 @@
         print "var=",var
     print "take a slice and look at field y",ds[1:6:2]["y"]
 
-test1()
+def test_ArrayDataSet():
+    #don't test stream
+    #tested only with float value
+    a = numpy.random.rand(10,4)
+    print a
+    ds = ArrayDataSet(a,{'x':slice(3),'y':3,'z':[0,2]})
+    assert len(ds)==10
+    #assert ds==a? should this work?
+    for i in range(len(ds)):
+        assert ds[i]['x'].all()==a[i][:2].all()
+        assert ds[i]['y']==a[i][3]
+        assert ds[i]['z'].all()==a[i][0:3:2].all()
+    print "x=",ds["x"]
+    print "x|y"
+    i=0
+    for x in ds('x','y'):
+        assert numpy.append(x['x'],x['y']).all()==a[i].all()
+        i+=1
+#    i=0
+#    for x in ds['x','y']: # don't work
+#        assert numpy.append(x['x'],x['y']).all()==a[i].all()
+#        i+=1
+#    for (x,y) in (ds('x','y'),a): #don't work # haven't found a variant that work.
+#        assert numpy.append(x,y)==z
+    i=0
+    for x,y in ds('x','y'):
+        assert numpy.append(x,y).all()==a[i].all()
+        i+=1
+    for minibatch in ds.minibatches(['x','z'], minibatch_size=3):
+        assert minibatch[0][:,0:3:2].all()==minibatch[1].all()
+    for x,z in ds.minibatches(['x','z'], minibatch_size=3):
+        assert x[:,0:3:2].all()==z.all()
+
+#    for minibatch in ds.minibatches(['z','y'], minibatch_size=3):
+#        print minibatch
+#    minibatch_iterator = ds.minibatches(fieldnames=['z','y'],n_batches=1,minibatch_size=3,offset=4)
+#    minibatch = minibatch_iterator.__iter__().next()
+#    print "minibatch=",minibatch
+#    for var in minibatch:
+#        print "var=",var
+#    print "take a slice and look at field y",ds[1:6:2]["y"]
+    have_thrown = False
+    try:
+        ds['h']
+    except :
+        have_thrown = True
+    assert have_thrown == True
+    assert ds == ds.fields().examples()
+    for field in ds.fields():
+        for field_value in field: # iterate over the values associated to that field for all the ds examples
+            pass
+    for field in ds('x','z').fields():
+        pass
+    for field in ds.fields(field1,field2):
+        pass
+    for field_examples in ds.fields():
+        for example_value in field_examples:
+            pass
+test_ArrayDataSet()
+