diff --git a/projet_conso.py b/projet_conso.py index b9909c0..5775f85 100644 --- a/projet_conso.py +++ b/projet_conso.py @@ -44,18 +44,18 @@ def estbissextile(annee) : def distance (t1 ,t2) : """prend en paramètre deux tuples, on calcule a l'aide la formule les distanjce entre chaque valeur des deux tuples et renvoit la distance entre les deux.""" - from maths import sqrt + from math import sqrt date1, temperaturemoy1, temperatureref1 = t1 date2, temperaturemoy2, temperatureref2 = t2 distancedate1 = 365- date2 distancedate2 = 365- date1 if distancedate1 < distancedate2 : - distancefin = sqrt((distance1**2) + (temperaturemoy1 - temperaturemoy2)**2 - +(temperatureref1 -teperatureref2)**2) + distancefin = sqrt((distancedate1**2) + (temperaturemoy1 - temperaturemoy2)**2 + +(temperatureref1 -temperatureref2)**2) return distancefin else: - distancefin = sqrt((distance2**2) + (temperaturemoy1 - temperaturemoy2)**2 - +(temperatureref1 -teperatureref2)**2) + distancefin = sqrt((distancedate2**2) + (temperaturemoy1 - temperaturemoy2)**2 + +(temperatureref1 -temperatureref2)**2) return distancefin