diff test_dataset.py @ 142:ad144fa72bf5

Automated merge with ssh://p-omega1@lgcm.iro.umontreal.ca/tlearn
author Frederic Bastien <bastienf@iro.umontreal.ca>
date Mon, 12 May 2008 14:15:16 -0400
parents 0c6fec172ae1
children 933db7ece663
line wrap: on
line diff
--- a/test_dataset.py	Fri May 09 17:38:57 2008 -0400
+++ b/test_dataset.py	Mon May 12 14:15:16 2008 -0400
@@ -320,11 +320,17 @@
       #    - 'fieldtypes': a list of types (one per field)
 
     #* ds1 | ds2 | ds3 == ds.hstack([ds1,ds2,ds3])#????
-        i=0
-        for example in hstack([ds('x'),ds('y'),ds('z')]):
-            example==ds[i]
-            i+=1 
-        del i,example
+        #hstack([ds('x','y'),ds('z')]
+        #hstack([ds('z','y'),ds('x')]
+        #assert have_thrown("hstack([ds('x'),ds('x')]")
+        #assert not have_thrown("hstack([ds('x'),ds('x')]")
+        #accept_nonunique_names
+        #assert have_thrown("hstack([ds('y','x'),ds('x')]")
+#        i=0
+#        for example in hstack([ds('x'),ds('y'),ds('z')]):
+#            example==ds[i]
+#            i+=1 
+#        del i,example
     #* ds1 & ds2 & ds3 == ds.vstack([ds1,ds2,ds3])#????