Mercurial Hosting > traffic-intelligence

comparison python/pavement.py @ 438:ca114520605f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor bug update
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Tue, 21 Jan 2014 17:24:02 -0500
parents 830136bc0e18
children ad61d21d3d1b
comparison
equal deleted inserted replaced
437:830136bc0e18 438:ca114520605f
121 return [exigence, x_moy, y_moy, age_revtm, classe_fonct, type_revtm, milieu, djma, djma_camions, peinture_lrd, peinture_lrg, peinture_lc] 121 return [exigence, x_moy, y_moy, age_revtm, classe_fonct, type_revtm, milieu, djma, djma_camions, peinture_lrd, peinture_lrg, peinture_lc]
122 122
123 def winterMaintenanceIndicators(data, startDate, endDate, circuitReference, snowThreshold): 123 def winterMaintenanceIndicators(data, startDate, endDate, circuitReference, snowThreshold):
124 '''Computes several winter maintenance indicators 124 '''Computes several winter maintenance indicators
125 data = entretien_hivernal = pylab.csv2rec('C:\Users\Alexandre\Documents\Cours\Poly\Projet\mesures_entretien_hivernal\mesures_deneigement.txt', delimiter = ',')''' 125 data = entretien_hivernal = pylab.csv2rec('C:\Users\Alexandre\Documents\Cours\Poly\Projet\mesures_entretien_hivernal\mesures_deneigement.txt', delimiter = ',')'''
126 import datetime
126 somme_eau, somme_neige, somme_abrasif, somme_sel, somme_lc, somme_lrg, somme_lrd, premiere_neige, compteur_somme_abrasif = 0,0,0,0,0,0,0,0,0 127 somme_eau, somme_neige, somme_abrasif, somme_sel, somme_lc, somme_lrg, somme_lrd, premiere_neige, compteur_somme_abrasif = 0,0,0,0,0,0,0,0,0
127 128
128 if circuitReference in data['ref_circuit']: 129 if circuitReference in data['ref_circuit']:
129 for i in range(len(data)-1): 130 for i in range(len(data)-1):
130 if data['ref_circuit'][i] == circuitReference and (data['date'][i] + datetime.timedelta(days = 6)) <= endDate and (data['date'][i] + datetime.timedelta(days = 6)) > startDate: 131 if data['ref_circuit'][i] == circuitReference and (data['date'][i] + datetime.timedelta(days = 6)) <= endDate and (data['date'][i] + datetime.timedelta(days = 6)) > startDate:
148 else: 149 else:
149 somme_eau, somme_neige, somme_abrasif, somme_sel, somme_lc, somme_lrg, somme_lrd, premiere_neige, autres_abrasifs, neigeMTQ_sup_seuil = '','','','','','','','','','' 150 somme_eau, somme_neige, somme_abrasif, somme_sel, somme_lc, somme_lrg, somme_lrd, premiere_neige, autres_abrasifs, neigeMTQ_sup_seuil = '','','','','','','','','',''
150 151
151 return [somme_eau, somme_neige, somme_abrasif, somme_sel, somme_lc, somme_lrg, somme_lrd, premiere_neige, autres_abrasifs, neigeMTQ_sup_seuil] 152 return [somme_eau, somme_neige, somme_abrasif, somme_sel, somme_lc, somme_lrg, somme_lrd, premiere_neige, autres_abrasifs, neigeMTQ_sup_seuil]
152 153
153 def environmentCanadaIndicators(data, startDate, endDate): 154 def ecWeatherIndicators(data, startDate, endDate):
154 '''Computes the indicators from Environment Canada files 155 '''Computes the indicators from Environment Canada files
155 (loaded as a recarray using csv2rec in data), 156 (loaded as a recarray using csv2rec in data),
156 between start and end dates (datetime.datetime objects)''' 157 between start and end dates (datetime.datetime objects)'''
157 nbre_jours_T_negatif,nbre_jours_gel_degel,pluie_tot,neige_tot,ecart_type_T = 0,0,0,0,0 158 nbre_jours_T_negatif,nbre_jours_gel_degel,pluie_tot,neige_tot,ecart_type_T = 0,0,0,0,0
158 compteur,nbre_jours_gel_consecutifs=0,0 159 compteur,nbre_jours_gel_consecutifs=0,0
187 else: 188 else:
188 compteur = 0 189 compteur = 0
189 nbre_jours_gel_consecutifs = max(nbre_jours_gel_consecutifs,compteur) 190 nbre_jours_gel_consecutifs = max(nbre_jours_gel_consecutifs,compteur)
190 ecart_type_T = np.std(tmoys) 191 ecart_type_T = np.std(tmoys)
191 192
192 return [nbre_jours_T_negatif,nbre_jours_gel_degel, deltas_T[0], deltas_T[1], deltas_T[2], deltas_T[3], nbre_jours_gel_consecutifs, pluie_tot, neige_tot, ecart_type_T] 193 return (nbre_jours_T_negatif,nbre_jours_gel_degel, deltas_T, nbre_jours_gel_consecutifs, pluie_tot, neige_tot, ecart_type_T)