Merge branch 'performance' of https://github.com/tla/stemmatology into performance
Jess Robinson [Thu, 3 May 2012 08:56:31 +0000 (08:56 +0000)]
Conflicts:
t/data/load-save-benchmark.json

1  2 
t/data/load-save-benchmark.json
t/load-save-speed.t

@@@ -1,1 -1,1 +1,1 @@@
- [{"save_times":[1000,1000,1000,0,0,20],"git_hash":"","load_times":[1000,1000,1000,0,0,5],"host":"sherlock"},{"save_times":[101,99.22,0.58,0,0,5],"git_hash":"278698b1bacdd6f828896a613aaeac721ea802bd","load_times":[94,92.64,1.33,0,0,20],"host":"sherlock"},{"save_times":[103,102.02,0.51,0,0,5],"git_hash":"278698b1bacdd6f828896a613aaeac721ea802bd","load_times":[95,93.38,1.31,0,0,20],"host":"sherlock"}]
 -[{"save_times":[1000,1000,1000,0,0,20],"git_hash":"","load_times":[1000,1000,1000,0,0,5]},{"save_times":[19,18.03,0.17,0,0,5],"git_hash":"dcfafc0ef909b6d2de167e72d1b532824fffcf30","load_times":[19,18.3,0.32,0,0,20]}]
++[{"save_times":[1000,1000,1000,0,0,20],"git_hash":"","load_times":[1000,1000,1000,0,0,5],"host":"sherlock"},{"save_times":[101,99.22,0.58,0,0,5],"git_hash":"278698b1bacdd6f828896a613aaeac721ea802bd","load_times":[94,92.64,1.33,0,0,20],"host":"sherlock"},{"save_times":[103,102.02,0.51,0,0,5],"git_hash":"278698b1bacdd6f828896a613aaeac721ea802bd","load_times":[95,93.38,1.31,0,0,20],"host":"sherlock"}]
Simple merge