Mercurial Hosting > traffic-intelligence
diff trafficintelligence/indicators.py @ 1029:c6cf75a2ed08
reorganization of imports
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Mon, 18 Jun 2018 22:50:59 -0400 |
parents | cc5cb04b04b0 |
children | b1ba6d44fcb9 |
line wrap: on
line diff
--- a/trafficintelligence/indicators.py Fri Jun 15 11:19:10 2018 -0400 +++ b/trafficintelligence/indicators.py Mon Jun 18 22:50:59 2018 -0400 @@ -1,13 +1,14 @@ #! /usr/bin/env python '''Class for indicators, temporal indicators, and safety indicators''' -from trafficintelligence import moving -#import matplotlib.nxutils as nx from matplotlib.pyplot import plot, ylim from matplotlib.pylab import find from numpy import array, arange, mean, floor, mean from scipy import percentile +from trafficintelligence import moving +from trafficintelligence.utils import LCSS as utilsLCSS + def multivariateName(indicatorNames): return '_'.join(indicatorNames) @@ -122,8 +123,6 @@ n += 1 return n >= nDimensions*proportionMatching -from utils import LCSS as utilsLCSS - class LCSS(utilsLCSS): '''Adapted LCSS class for indicators, same pattern''' def __init__(self, similarityFunc, delta = float('inf'), minLength = 0, aligned = False, lengthFunc = min):