Mercurial Hosting > traffic-intelligence

diff python/moving.py @ 368:2db4e76599a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implemented subsequence extraction and rearranged arguments
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Mon, 15 Jul 2013 15:08:53 -0400
parents 619ae9a9a788
children 027e254f0b53
line wrap: on
line diff
--- a/python/moving.py	Mon Jul 15 12:13:08 2013 -0400
+++ b/python/moving.py	Mon Jul 15 15:08:53 2013 -0400
@@ -540,11 +540,11 @@
 
     @staticmethod
     def norm2LCSS(t1, t2, threshold):
-        return utils.LCSS(t1, t2, threshold, Point.distanceNorm2)
+        return utils.LCSS(t1, t2, lambda x,y: Point.distanceNorm2(x,y) <= threshold)
 
     @staticmethod
     def normMaxLCSS(t1, t2, threshold):
-        return utils.LCSS(t1, t2, threshold, lambda p1, p2: (p1-p2).normMax())
+        return utils.LCSS(t1, t2, lambda p1, p2: (p1-p2).normMax() <= threshold)
 
 class CurvilinearTrajectory(Trajectory):
     '''Sub class of trajectory for trajectories with curvilinear coordinates and lane assignements