# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1390343042 18000
# Node ID ca114520605fe81a48b1feaf9a8ef6b77d1eaaa7
# Parent  830136bc0e18a5880530717c03ba4974ab3f8dcc
minor bug update

diff -r 830136bc0e18 -r ca114520605f python/pavement.py
--- a/python/pavement.py	Tue Jan 21 16:31:30 2014 -0500
+++ b/python/pavement.py	Tue Jan 21 17:24:02 2014 -0500
@@ -123,6 +123,7 @@
 def winterMaintenanceIndicators(data, startDate, endDate, circuitReference, snowThreshold):
     '''Computes several winter maintenance indicators
     data = entretien_hivernal = pylab.csv2rec('C:\Users\Alexandre\Documents\Cours\Poly\Projet\mesures_entretien_hivernal\mesures_deneigement.txt', delimiter = ',')'''
+    import datetime
     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
 
     if circuitReference in data['ref_circuit']:
@@ -150,7 +151,7 @@
 
     return [somme_eau, somme_neige, somme_abrasif, somme_sel, somme_lc, somme_lrg, somme_lrd, premiere_neige, autres_abrasifs, neigeMTQ_sup_seuil]
 
-def environmentCanadaIndicators(data, startDate, endDate):
+def ecWeatherIndicators(data, startDate, endDate):
     '''Computes the indicators from Environment Canada files
     (loaded as a recarray using csv2rec in data),
     between start and end dates (datetime.datetime objects)'''
@@ -189,4 +190,4 @@
         nbre_jours_gel_consecutifs = max(nbre_jours_gel_consecutifs,compteur)
     ecart_type_T = np.std(tmoys)
 
-    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]
+    return (nbre_jours_T_negatif,nbre_jours_gel_degel, deltas_T, nbre_jours_gel_consecutifs, pluie_tot, neige_tot, ecart_type_T)