X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=caesar_break_parameter_trials.csv;h=e18f92c5604d97855b83cff0fdce99d17c7385a1;hb=9aaf3ba07c806ce1ad36af30b2df407dd76ca4fa;hp=6f71f0779797eb302a00da9557f6b23fd20447ae;hpb=a9d938167b636e599586ebbc5aeec75c877e120f;p=cipher-tools.git

diff --git a/caesar_break_parameter_trials.csv b/caesar_break_parameter_trials.csv
index 6f71f07..e18f92c 100644
--- a/caesar_break_parameter_trials.csv
+++ b/caesar_break_parameter_trials.csv
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ,message_length
 scoring, 300, 100, 50, 30, 20, 10, 5
 Pletters, 0.9994, 0.9994, 0.9994, 0.9966, 0.9778, 0.8174, 0.4712
@@ -91,3 +92,15 @@ l3 + normalised, 1.0, 0.9986, 0.9932, 0.963, 0.8696, 0.594, 0.4122
 l3 + normalised, 1.0, 0.9986, 0.9932, 0.963, 0.8696, 0.594, 0.4122
 l3 + normalised, 1.0, 0.9986, 0.9932, 0.963, 0.8696, 0.594, 0.4122
 l3 + normalised, 1.0, 0.9986, 0.9932, 0.963, 0.8696, 0.594, 0.4122
+=======
+"name",100,50,30,20,10,5
+"Pletters",4996,4997,4984,4900,4063,2358
+"cosine_similarity + euclidean_scaled",4998,4986,4914,4659,3528,2198
+"cosine_similarity + normalised",4997,4993,4917,4659,3557,2084
+"l1 + euclidean_scaled",4998,4992,4951,4755,3767,2192
+"l1 + normalised",4998,4996,4936,4767,3596,2161
+"l2 + euclidean_scaled",4998,4990,4926,4683,3567,2179
+"l2 + normalised",4995,4993,4920,4672,3610,2135
+"l3 + euclidean_scaled",4996,4964,4822,4457,3167,2018
+"l3 + normalised",4999,4973,4797,4351,2872,1989
+>>>>>>> 883806c... More tweaking