Update.

[python.git] / covid19.py

diff --git a/covid19.py b/covid19.py
index ea79544..beccb9b 100755 (executable)
--- a/covid19.py
+++ b/covid19.py
@@ -5,44 +5,53 @@
 
 # Written by Francois Fleuret <francois@fleuret.org>
 
-import os, time, math
+import os, time
 import numpy, csv
 import matplotlib.pyplot as plt
 import matplotlib.dates as mdates
 import urllib.request
 
-url = 'https://github.com/CSSEGISandData/COVID-19/raw/master/csse_covid_19_data/csse_covid_19_time_series/time_series_19-covid-Confirmed.csv'
+######################################################################
 
-file = 'time_series_19-covid-Confirmed.csv'
+def gentle_download(url, delay = 86400):
+    filename = url[url.rfind('/') + 1:]
+    if not os.path.isfile(filename) or os.path.getmtime(filename) < time.time() - delay:
+        print(f'Retrieving {url}')
+        urllib.request.urlretrieve(url, filename)
+    return filename
 
 ######################################################################
 
-if not os.path.isfile(file) or os.path.getmtime(file) < time.time() - 86400:
-    print('Retrieving file')
-    urllib.request.urlretrieve(url, file)
+nbcases_filename = gentle_download(
+    'https://raw.githubusercontent.com/CSSEGISandData/COVID-19/master/csse_covid_19_data/csse_covid_19_time_series/time_series_covid19_confirmed_global.csv'
+)
 
 ######################################################################
 
-with open(file, newline='') as csvfile:
+with open(nbcases_filename, newline='') as csvfile:
     reader = csv.reader(csvfile, delimiter=',')
     times = []
     nb_cases = {}
     time_col = 5
     for row_nb, row in enumerate(reader):
         for col_nb, field in enumerate(row):
-            if row_nb >= 1 and col_nb == 1:
-                country = field
-                if not country in nb_cases:
-                    nb_cases[country] = numpy.zeros(len(times))
             if row_nb == 0 and col_nb >= time_col:
                 times.append(time.mktime(time.strptime(field, '%m/%d/%y')))
-            if row_nb == 1 and col_nb == time_col:
-                nb_cases['World'] = numpy.zeros(len(times))
             if row_nb >= 1:
-                if col_nb >= time_col:
-                    nb_cases['World'][col_nb - time_col] += int(field)
+                if col_nb == 1:
+                    country = field
+                    if not country in nb_cases:
+                        nb_cases[country] = numpy.zeros(len(times))
+                elif col_nb >= time_col:
+                    # if field == '': field = '0'
                     nb_cases[country][col_nb - time_col] += int(field)
 
+countries = list(nb_cases.keys())
+countries.sort()
+print('Countries: ', countries)
+
+nb_cases['World'] = sum(nb_cases.values())
+
 ######################################################################
 
 fig = plt.figure()
@@ -54,12 +63,10 @@ ax.set_xlabel('Date', labelpad = 10)
 ax.set_yscale('log')
 
 myFmt = mdates.DateFormatter('%b %d')
+
 ax.xaxis.set_major_formatter(myFmt)
 dates = mdates.epoch2num(times)
 
-print('Countries:')
-print(nb_cases.keys())
-
 for key, color, label in [
         ('World', 'blue', 'World'),
         ('Switzerland', 'red', 'Switzerland'),
@@ -69,11 +76,13 @@ for key, color, label in [
         ('Italy', 'purple', 'Italy'),
         ('China', 'orange', 'China')
 ]:
-    ax.plot(dates, nb_cases[key], color = color, label = label, linewidth=2)
+    ax.plot(dates, nb_cases[key],
+            color = color, label = label, linewidth = 2)
 
 ax.legend(frameon = False)
 
 plt.show()
-fig.savefig('covid19.png')
+
+fig.savefig('covid19_nb_cases.png')
 
 ######################################################################