Mercurial Hosting > traffic-intelligence

diff python/tests/utils.txt @ 366:90bdabc06e9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated LCSS to be more generic with a single similarity function
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Mon, 15 Jul 2013 12:12:47 -0400
parents efd4dd4665ac
children 2db4e76599a1
line wrap: on
line diff
--- a/python/tests/utils.txt	Fri Jul 12 11:28:47 2013 -0400
+++ b/python/tests/utils.txt	Mon Jul 15 12:12:47 2013 -0400
@@ -44,29 +44,37 @@
 >>> stepPlot([3, 5, 7, 8], 1, 10, 0)
 ([1, 3, 3, 5, 5, 7, 7, 8, 8, 10], [0, 0, 1, 1, 2, 2, 3, 3, 4, 4])
 
->>> LCSS(range(5), range(5), 0.1, lambda x,y:abs(x-y))
+>>> LCSS(range(5), range(5), lambda x,y:(abs(x-y) <= 0.1))
 5
->>> LCSS(range(1,5), range(5), 0.1, lambda x,y:abs(x-y))
+>>> LCSS(range(1,5), range(5), lambda x,y:(abs(x-y) <= 0.1))
 4
->>> LCSS(range(5,10), range(5), 0.1, lambda x,y:abs(x-y))
+>>> LCSS(range(5,10), range(5), lambda x,y:(abs(x-y) <= 0.1))
 0
->>> LCSS(range(5), range(10), 0.1, lambda x,y:abs(x-y))
+>>> LCSS(range(5), range(10), lambda x,y:(abs(x-y) <= 0.1))
 5
->>> LCSS(range(5), range(10), 0.1, lambda x,y:abs(x-y), 2)
+>>> LCSS(range(5), range(10), lambda x,y:(abs(x-y) <= 0.1), 2)
 5
-
->>> alignedLCSS(range(5), range(5), 0.1, lambda x,y:abs(x-y), 2)
-5
->>> alignedLCSS(range(1,5), range(5), 0.1, lambda x,y:abs(x-y), 2)
+>>> LCSS(['a','b','c'], ['a','b','c', 'd'], lambda x,y: x == y)
+3
+>>> LCSS(['a','b','c'], ['a','b','c', 'd'], lambda x,y: x == y, 2)
+3
+>>> LCSS(['a','x','b','c'], ['a','b','c','d','x'], lambda x,y: x == y)
+3
+>>> LCSS(['a','b','c','x','d'], ['a','b','c','d','x'], lambda x,y: x == y)
 4
 
->>> alignedLCSS(range(5,10), range(10), 0.1, lambda x,y:abs(x-y), 2)
+>>> alignedLCSS(range(5), range(5), lambda x,y:(abs(x-y) <= 0.1), 2)
 5
->>> LCSS(range(5,10), range(10), 0.1, lambda x,y:abs(x-y), 2)
+>>> alignedLCSS(range(1,5), range(5), lambda x,y:(abs(x-y) <= 0.1), 2)
+4
+
+>>> alignedLCSS(range(5,10), range(10), lambda x,y:(abs(x-y) <= 0.1), 2)
+5
+>>> LCSS(range(5,10), range(10), lambda x,y:(abs(x-y) <= 0.1), 2)
 0
->>> alignedLCSS(range(5), range(5), 0.1, lambda x,y:abs(x-y), 6)
+>>> alignedLCSS(range(5), range(5), lambda x,y:(abs(x-y) <= 0.1), 6)
 5
->>> alignedLCSS(range(5), range(6), 0.1, lambda x,y:abs(x-y), 6)
+>>> alignedLCSS(range(5), range(6), lambda x,y:(abs(x-y) <= 0.1), 6)
 5
->>> alignedLCSS(range(1,7), range(6), 0.1, lambda x,y:abs(x-y), 10)
+>>> alignedLCSS(range(1,7), range(6), lambda x,y:(abs(x-y) <= 0.1), 10)
 5