Mercurial Hosting > traffic-intelligence
diff python/indicators.py @ 375:2ea8584aa80a
making indicator LCSS work
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Wed, 17 Jul 2013 01:29:25 -0400 |
parents | 97e8fa0ee9a1 |
children | 2e6b8610bcaa |
line wrap: on
line diff
--- a/python/indicators.py Wed Jul 17 00:50:44 2013 -0400 +++ b/python/indicators.py Wed Jul 17 01:29:25 2013 -0400 @@ -74,14 +74,14 @@ def getValues(self): return [self.__getitem__(t) for t in self.timeInterval] - def plot(self, options = '', xfactor = 1., **kwargs): + def plot(self, options = '', xfactor = 1., timeShift = 0, **kwargs): from matplotlib.pylab import plot,ylim if self.getTimeInterval().length() == 1: marker = 'o' else: marker = '' time = sorted(self.values.keys()) - plot([x/xfactor for x in time], [self.values[i] for i in time], options+marker, **kwargs) + plot([(x+timeShift)/xfactor for x in time], [self.values[i] for i in time], options+marker, **kwargs) if self.maxValue: ylim(ymax = self.maxValue) @@ -110,9 +110,9 @@ def __init__(self, threshold, delta = float('inf'), aligned = False, lengthFunc = min): utilsLCSS.__init__(self, lambda x,y: (distanceForLCSS(x,y) <= threshold), delta, aligned, lengthFunc) - def compute(self, indicator1, indicator2): + def compute(self, indicator1, indicator2, computeSubSequence = False): if indicator1 and indicator2: - return self._compute(indicator1.getValues(), indicator2.getValues()) + return self._compute(indicator1.getValues(), indicator2.getValues(), computeSubSequence) else: return 0