From: Eden Cardim <edencardim@gmail.com>
Date: Wed, 2 May 2012 15:18:51 +0000 (-0300)
Subject: using YAML-based collapser
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=801622457e78c1f79e1a24c29cbce6901933d936;p=scpubgit%2Fstemmatology.git

using YAML-based collapser

Conflicts:

	Makefile.PL
	lib/Text/Tradition/Directory.pm
	t/data/load-save-benchmark.json
	t/data/speed_test_load.sql
	t/load-save-speed.t
---

diff --git a/t/data/load-save-benchmark.json b/t/data/load-save-benchmark.json
index cb439cf..a859827 100644
--- a/t/data/load-save-benchmark.json
+++ b/t/data/load-save-benchmark.json
@@ -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":[21,19.92,0.17,0,0,5],"git_hash":"b12c40e2a6558cd0e9f00341088cc0086e73001e","load_times":[22,20.51,0.49,0,0,20],"host":"bjork.local"},{"save_times":[11,7.67,0.16,0,0,5],"git_hash":"1d1e2121214d4824ef342aa5cf16c97d9e2b358a","load_times":[11,10.74,0.23,0,0,20],"host":"bjork.local"}]
\ No newline at end of file
+[{"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":[21,19.92,0.17,0,0,5],"git_hash":"b12c40e2a6558cd0e9f00341088cc0086e73001e","load_times":[22,20.51,0.49,0,0,20],"host":"bjork.local"},{"save_times":[11,7.67,0.16,0,0,5],"git_hash":"1d1e2121214d4824ef342aa5cf16c97d9e2b358a","load_times":[11,10.74,0.23,0,0,20],"host":"bjork.local"}]
diff --git a/t/data/speed_test_load.sql b/t/data/speed_test_load.sql
index 71142eb..3a816b9 100644
--- a/t/data/speed_test_load.sql
+++ b/t/data/speed_test_load.sql
@@ -1,3 +1,4 @@
+PRAGMA foreign_keys=OFF;
 BEGIN TRANSACTION;
 CREATE TABLE entries (
   id varchar NOT NULL,