# HG changeset patch
# User Frederic Bastien <bastienf@iro.umontreal.ca>
# Date 1211998592 14400
# Node ID 584ad7c558760f480f8a45aa3a43e364e122799f
# Parent  a70f2c973ea5a0d548fdd784a174614a92f324cf# Parent  6aff510792dde589ae66fbbf708a7ad129d45728
Automated merge with ssh://projects@lgcm.iro.umontreal.ca/hg/pylearn

diff -r a70f2c973ea5 -r 584ad7c55876 test_dataset.py
--- a/test_dataset.py	Wed May 28 14:09:19 2008 -0400
+++ b/test_dataset.py	Wed May 28 14:16:32 2008 -0400
@@ -494,10 +494,7 @@
     print "test_speed"
     import time
     a2 = numpy.random.rand(100000,400)
-    ds = ArrayDataSet(a2,{'x':slice(3),'y':3,'z':[0,2]})###???tuple not tested
-    ds = ArrayDataSet(a2,LookupList(['x','y','z'],[slice(3),3,[0,2]]))###???tuple not tested
     ds = ArrayDataSet(a2,{'all':slice(0,a2.shape[1],1)})
-    #assert ds==a? should this work?
     mat = numpy.random.rand(400,100)
     @print_timing
     def f_array1(a):