comparison python/utils.py @ 286:fa95796a76b3

simplified indicators (only non-measured values, whether measurable or not)
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Sun, 27 Jan 2013 00:22:55 -0500
parents 5957aa1d69e1
children f6f423e25c7f
comparison
equal deleted inserted replaced
285:5957aa1d69e1 286:fa95796a76b3
173 m = len(l1) 173 m = len(l1)
174 n = len(l2) 174 n = len(l2)
175 similarity = zeros((m+1,n+1), dtype = npint) 175 similarity = zeros((m+1,n+1), dtype = npint)
176 for i in xrange(1,m+1): 176 for i in xrange(1,m+1):
177 for j in xrange(max(1,i-delta),min(n+1,i+delta)): 177 for j in xrange(max(1,i-delta),min(n+1,i+delta)):
178 if distance(l1[i-1], l2[j-1])<threshold: 178 if distance(l1[i-1], l2[j-1])<=threshold:
179 similarity[i][j] = similarity[i-1][j-1]+1 179 similarity[i][j] = similarity[i-1][j-1]+1
180 else: 180 else:
181 similarity[i][j] = max(similarity[i-1][j], similarity[i][j-1]) 181 similarity[i][j] = max(similarity[i-1][j], similarity[i][j-1])
182 return similarity[-1][-1] 182 return similarity[-1][-1]
183 183