Mercurial Hosting > traffic-intelligence

comparison python/pavement.py @ 503:7978b286fcfa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected call to new weather indicator function
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Tue, 27 May 2014 17:09:10 -0400
parents 33574b94f09e
children 3058e00887bc
comparison
equal deleted inserted replaced
502:33574b94f09e 503:7978b286fcfa
300 nonZeroIndices = ~np.isnan(self.data[dataLabel]) 300 nonZeroIndices = ~np.isnan(self.data[dataLabel])
301 days = self.data[nonZeroIndices]['jours'] 301 days = self.data[nonZeroIndices]['jours']
302 dates = self.data[nonZeroIndices]['date_mesure'] 302 dates = self.data[nonZeroIndices]['date_mesure']
303 measures = self.data[nonZeroIndices][dataLabel] 303 measures = self.data[nonZeroIndices][dataLabel]
304 for i in range(1, len(dates)): 304 for i in range(1, len(dates)):
305 nDaysTNegative, nDaysThawFreeze, deltaTemp, nConsecutiveFrozenDays, totalRain, totalSnow, snowAboveThreshold, stdevTemp = ecWeatherIndicators(weatherData, dates[i-1], dates[i], snowThreshold, weatherDataType, minProportionMeasures) 305 nDaysTNegative, nDaysThawFreeze, deltaTemp, nConsecutiveFrozenDays, totalRain, totalSnow, snowAboveThreshold, stdevTemp = weatherIndicators(weatherData, dates[i-1], dates[i], snowThreshold, weatherDataType, minProportionMeasures)
306 if dates[i-1].year+1 == dates[i].year: 306 if dates[i-1].year+1 == dates[i].year:
307 winter = 1 307 winter = 1
308 if days[i-1]<365: 308 if days[i-1]<365:
309 firstWinter = 1 309 firstWinter = 1
310 else: 310 else: