Merge branch 'master' of gitfub.space:caspervk/nightr

This commit is contained in:
Casper V. Kristensen 2019-04-07 05:02:13 +02:00
commit 55d6a9ee39
Signed by: caspervk
GPG key ID: 289CA03790535054

View file

@ -19,9 +19,9 @@ def is_tide(context: Context) -> Prediction:
month, cur_year_total_cars, last_year_total_cars = determine_month() month, cur_year_total_cars, last_year_total_cars = determine_month()
month = int(month) month = int(month)
p.reasons.append(f"The month is {calendar.month_name[month]}")
p.reasons.append(f"The number of cars having driven on the Storbæltsbro is {cur_year_total_cars}, in the current year") p.reasons.append(f"The number of cars having driven on the Storbæltsbro is {cur_year_total_cars}, in the current year")
p.reasons.append(f"The number of cars having driven over it in the last year is {last_year_total_cars}, thus the frequency is: {last_year_total_cars / cur_year_total_cars}") p.reasons.append(f"The number of cars having driven over it in the last year is {last_year_total_cars}, thus the frequency is: {last_year_total_cars / cur_year_total_cars:.2f}")
p.reasons.append(f"The month is therefore {calendar.month_name[month]}")
tide_data = requests.get('https://www.dmi.dk/fileadmin/user_upload/Bruger_upload/Tidevand/2019/Aarhus.t.txt') tide_data = requests.get('https://www.dmi.dk/fileadmin/user_upload/Bruger_upload/Tidevand/2019/Aarhus.t.txt')
@ -77,7 +77,7 @@ def is_tide(context: Context) -> Prediction:
moments.append(time[0]) moments.append(time[0])
night = sum([1 for x in moments if 6 >= x.hour or x.hour >= 22]) night = sum([1 for x in moments if 6 >= x.hour or x.hour >= 22])
p.reasons.append(f"The water level is currently at {current_water_level}") p.reasons.append(f"The water level is currently at {current_water_level} in the Aarhus Bay")
p.reasons.append(f"The number of times the water is at the current level at nighttime is: {night}, compared to the total amount of times in {calendar.month_name[month]}, being {len(moments)}") p.reasons.append(f"The number of times the water is at the current level at nighttime is: {night}, compared to the total amount of times in {calendar.month_name[month]}, being {len(moments)}")
p.probability = 1 - (night / len(moments)) p.probability = 1 - (night / len(moments))