Mercurial > pylearn
changeset 124:9c4f522526bf
Automated merge with ssh://p-omega1@lgcm.iro.umontreal.ca/tlearn
author | Frederic Bastien <bastienf@iro.umontreal.ca> |
---|---|
date | Wed, 07 May 2008 16:20:40 -0400 |
parents | 2ca8dccba270 (current diff) 8b520423d4ee (diff) |
children | 7d8b3d6dd4e9 |
files | |
diffstat | 2 files changed, 8 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/dataset.py Wed May 07 16:08:18 2008 -0400 +++ b/dataset.py Wed May 07 16:20:40 2008 -0400 @@ -355,13 +355,13 @@ Sub-classes which implement finite-length datasets should redefine this method. Some methods only make sense for finite-length datasets. """ - return sys.maxint + return maxint def is_unbounded(self): """ Tests whether a dataset is unbounded (e.g. a stream). """ - return len(self)==sys.maxint + return len(self)==maxint def hasFields(self,*fieldnames): """
--- a/test_dataset.py Wed May 07 16:08:18 2008 -0400 +++ b/test_dataset.py Wed May 07 16:20:40 2008 -0400 @@ -320,11 +320,11 @@ # - '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 + 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])#???? @@ -401,11 +401,7 @@ print "test_ArrayFieldsDataSet" raise NotImplementedError() -import pmat - -load_pmat_as_array_dataset("tmp.pmat") - test1() test_LookupList() test_ArrayDataSet() - +#test pmat.py