Mercurial Hosting > traffic-intelligence
changeset 442:eb8baa080470
generalized indicator LCSS with similarityFunc (thanks Mohamed)
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Mon, 27 Jan 2014 01:19:19 -0500 |
| parents | b5cc6b001ae6 |
| children | 51810d737d86 |
| files | python/indicators.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/python/indicators.py Wed Jan 22 23:41:32 2014 -0500 +++ b/python/indicators.py Mon Jan 27 01:19:19 2014 -0500 @@ -97,7 +97,7 @@ return values -def distanceForLCSS(x, y): # lambda x,y:abs(x-y) +def l1Distance(x, y): # lambda x,y:abs(x-y) if x == None or y == None: return float('inf') else: @@ -107,8 +107,8 @@ class LCSS(utilsLCSS): '''Adapted LCSS class for indicators, same pattern''' - def __init__(self, threshold, delta = float('inf'), minLength = 0, aligned = False, lengthFunc = min): - utilsLCSS.__init__(self, lambda x,y: (distanceForLCSS(x,y) <= threshold), delta, aligned, lengthFunc) + def __init__(self, similarityFunc, delta = float('inf'), minLength = 0, aligned = False, lengthFunc = min): + utilsLCSS.__init__(self, similarityFunc, delta, aligned, lengthFunc) self.minLength = minLength def checkIndicator(self, indicator):