nsaunier/traffic-intelligence: python/utils.py comparison

add delta to sample the time window in LCSS function

comparison

equal deleted inserted replaced

-:f2cf16ad798f
+:8e66ced156dd
 #########################
 # maths section
 #########################
-def LCSS(l1, l2, threshold, distance):
+def LCSS(l1, l2, threshold, delta, distance):
 '''returns the longest common subsequence similarity
-based on the threshold on distance between two elements of lists l1, l2'''
+based on the threshold on distance between two elements of lists l1, l2.
+	looks for points that are sampled within a delta time window, can put 'inf' value to cancl this condition'''
 from numpy import zeros, int as npint
 m = len(l1)
 n = len(l2)
 similarity = zeros((m+1,n+1), dtype = npint)
 for i in xrange(1,m+1):
 for j in xrange(1,n+1):
-if distance(l1[i-1], l2[j-1])<threshold:
+			from math import fabs
-similarity[i][j] = similarity[i-1][j-1]+1
+			while fabs(i-j)<= delta:
-else:
+if distance(l1[i-1], l2[j-1])<threshold:
-similarity[i][j] = max(similarity[i-1][j], similarity[i][j-1])
+similarity[i][j] = similarity[i-1][j-1]+1
+else:
+similarity[i][j] = max(similarity[i-1][j], similarity[i][j-1])
 return similarity[-1][-1]
 def framesToTime(nFrames, frameRate, initialTime = (0.,0.,0.)):
 'returns hour, minutes and seconds'
 from math import floor

Mercurial > hg > nsaunier > traffic-intelligence