update test times

git-svn-id: https://bucket.mit.edu/svn/nilm/tags/nilmdb-orig-tests@11322 ddd99763-3ecb-0310-9145-efcb8ce7c51f

Makefile

@@ -1,2 +1,2 @@
 all:
-	nosetests
+	nosetests nilmdb/test_interval.py

nilmdb/test_interval.py

@@ -91,7 +91,8 @@ def test_intervalset_construct():
     assert(iseta == isetc)
     assert(iseta != 3)
     assert(IntervalSet(a) != IntervalSet(b))
-    
+
+    print iseta == None
     assert_raises(TypeError, cmp, iseta, isetb)
     assert_raises(IntervalError, IntervalSet, [a, b, c])
     assert_raises(TypeError, IntervalSet, [1, 2])

test/Makefile

@@ -1,5 +1,5 @@
 all:
-	python speed-readbinary.py
+	python speed-readascii.py
 
 clean:
 	rm -f *pyc

test/speed-readascii.py

@@ -43,17 +43,24 @@ def test_bigregex():
         if (n % 100000 == 0):
             printf("line %d = %s\n", n, str(out))
 
+def test_numpy():
+    out = np.genfromtxt(open('1m.raw', 'r'),
+                        dtype = np.dtype('i2,i2,i2,i2,i2,i2'))
+    
+with Timer("numpy"):
+    test_numpy() # 106k/sec
+
 with Timer("regex"):
-    test_regex() # 102k/sec
+    test_regex() # 121k/sec
 
 with Timer("split"):
-    test_split() # 175k/sec
+    test_split() # 219k/sec
 
 with Timer("split2"):
-    test_split2() # 275k/sec
+    test_split2() # 328k/sec
 
 with Timer("bigregex"):
-    test_bigregex() # 110k/sec
+    test_bigregex() # 130k/sec
 
 # The "int" operation takes quite a while -- int(x,10) is twice as fast
 # Perl does about 500k/sec