add py-yajl to the shootout; we are still the fastest

tools/shootout.py

@@ -1,37 +1,60 @@
 
+import random
+
 import cjson
+import yajl
 import tnetstring
 
 from tnetstring.tests.test_format import FORMAT_EXAMPLES, get_random_object
-for _ in xrange(20):
-    v = get_random_object(jsonsafe=True)
-    FORMAT_EXAMPLES[tnetstring.dumps(v)] = v
 
-JSON_EXAMPLES = {}
-for k,v in FORMAT_EXAMPLES.items():
-    JSON_EXAMPLES[cjson.encode(v)] = v
+TESTS = []
+def add_test(v):
+    #  These modules have a few round-tripping problems...
+    try:
+        assert cjson.decode(cjson.encode(v)) == v
+        assert yajl.loads(yajl.dumps(v)) == v
+    except Exception:
+        pass
+    else:
+        TESTS.append((v,tnetstring.dumps(v),cjson.encode(v)))
+
+for (k,v) in FORMAT_EXAMPLES.iteritems():
+    add_test(v)
+for _ in xrange(20):
+    v = get_random_object(random.Random(0),jsonsafe=True)
+    add_test(v)
 
 def thrash_tnetstring():
-    for data, expect in FORMAT_EXAMPLES.items():
-        assert tnetstring.loads(data) == expect
-        assert tnetstring.loads(tnetstring.dumps(expect)) == expect
+    for obj, tns, json in TESTS:
+        assert tnetstring.loads(tns) == obj
+        assert tnetstring.loads(tnetstring.dumps(obj)) == obj
 
 def thrash_cjson():
-    for data, expect in JSON_EXAMPLES.items():
-        assert cjson.decode(data) == expect
-        assert cjson.decode(cjson.encode(expect)) == expect
+    for obj, tns, json in TESTS:
+        assert cjson.decode(json) == obj
+        assert cjson.decode(cjson.encode(obj)) == obj
+
+def thrash_yajl():
+    for obj, tns, json in TESTS:
+        assert yajl.loads(json) == obj
+        assert yajl.loads(yajl.dumps(obj)) == obj
 
 
 if __name__ == "__main__":
     import timeit
-    t1 = timeit.Timer("thrash_cjson()",
-                      "from shootout import thrash_cjson")
-    t1 = min(t1.repeat(number=10000))
-    print "cjson:", t1
-    t2 = timeit.Timer("thrash_tnetstring()",
+    t1 = timeit.Timer("thrash_tnetstring()",
                       "from shootout import thrash_tnetstring")
+    t1 = min(t1.repeat(number=10000))
+    print "tnetstring", t1
+    t2 = timeit.Timer("thrash_cjson()",
+                      "from shootout import thrash_cjson")
     t2 = min(t2.repeat(number=10000))
-    print "tnetstring", t2
-    print "speedup: ", round((t1 - t2) / (t1) * 100,2), "%"
+    print "cjson:", t2
+    print "speedup: ", round((t2 - t1) / (t2) * 100,2), "%"
+    t3 = timeit.Timer("thrash_yajl()",
+                      "from shootout import thrash_yajl")
+    t3 = min(t3.repeat(number=10000))
+    print "yajl:", t3
+    print "speedup: ", round((t3 - t1) / (t3) * 100,2), "%"