From: Jess Robinson Date: Thu, 3 May 2012 08:56:31 +0000 (+0000) Subject: Merge branch 'performance' of https://github.com/tla/stemmatology into performance X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=65241a526a924d6618da277887f35ef5ed612c6b;p=scpubgit%2Fstemmatology.git Merge branch 'performance' of https://github.com/tla/stemmatology into performance Conflicts: t/data/load-save-benchmark.json --- 65241a526a924d6618da277887f35ef5ed612c6b diff --cc t/data/load-save-benchmark.json index 6a23994,2323807..fe7c0c5 --- a/t/data/load-save-benchmark.json +++ b/t/data/load-save-benchmark.json @@@ -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"}]