diff --git a/figure/num_cases.svg b/figure/num_cases.svg index 25b0171ee..3ec52b9d8 100644 --- a/figure/num_cases.svg +++ b/figure/num_cases.svg @@ -1,7 +1,7 @@ - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + @@ -295,26 +295,26 @@ L 37.796875 17.1875 L 4.890625 17.1875 L 4.890625 26.703125 z -" id="DejaVuSans-34"/> +" id="DejaVuSans-52"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -343,26 +343,26 @@ Q 35.15625 39.890625 26.703125 39.890625 Q 22.75 39.890625 18.8125 39.015625 Q 14.890625 38.140625 10.796875 36.28125 z -" id="DejaVuSans-35"/> +" id="DejaVuSans-53"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -397,26 +397,26 @@ Q 23.390625 74.21875 37.203125 74.21875 Q 40.921875 74.21875 44.703125 73.484375 Q 48.484375 72.75 52.59375 71.296875 z -" id="DejaVuSans-36"/> +" id="DejaVuSans-54"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -430,26 +430,26 @@ L 18.3125 0 L 43.21875 64.59375 L 8.203125 64.59375 z -" id="DejaVuSans-37"/> +" id="DejaVuSans-55"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -493,239 +493,239 @@ Q 38.140625 66.40625 31.78125 66.40625 Q 25.390625 66.40625 21.84375 63.234375 Q 18.3125 60.0625 18.3125 54.390625 z -" id="DejaVuSans-38"/> +" id="DejaVuSans-56"/> - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + @@ -736,184 +736,184 @@ z +" id="m5055b10f0d" style="stroke:#000000;stroke-width:0.8;"/> - + - + - + - - - - + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - +" id="ma77ba3cad2" style="stroke:#ff0000;"/> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - +" id="m1098edc37c" style="stroke:#ffa500;"/> - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -1371,7 +1371,7 @@ Q 24.65625 74.21875 41.21875 74.21875 Q 47.75 74.21875 53.53125 72.484375 Q 59.328125 70.75 64.40625 67.28125 z -" id="DejaVuSans-43"/> +" id="DejaVuSans-67"/> +" id="DejaVuSans-111"/> +" id="DejaVuSans-110"/> +" id="DejaVuSans-102"/> +" id="DejaVuSans-105"/> +" id="DejaVuSans-114"/> +" id="DejaVuSans-109"/> +" id="DejaVuSans-101"/> - +" id="DejaVuSans-100"/> + +" id="DejaVuSans-97"/> +" id="DejaVuSans-115"/> +" id="DejaVuSans-79"/> +" id="DejaVuSans-104"/> - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - + @@ -1706,7 +1706,7 @@ L 25.59375 0 L 25.59375 64.59375 L -0.296875 64.59375 z -" id="DejaVuSans-54"/> +" id="DejaVuSans-84"/> +" id="DejaVuSans-116"/> +" id="DejaVuSans-108"/> - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + @@ -1782,7 +1782,7 @@ L 19.390625 60.984375 L 19.390625 0 L 9.8125 0 z -" id="DejaVuSans-4e"/> +" id="DejaVuSans-78"/> +" id="DejaVuSans-119"/> +" id="DejaVuSans-121"/> - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/figure/num_death.svg b/figure/num_death.svg index 551dff4b3..129b04f0c 100644 --- a/figure/num_death.svg +++ b/figure/num_death.svg @@ -1,7 +1,7 @@ - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + @@ -295,26 +295,26 @@ L 37.796875 17.1875 L 4.890625 17.1875 L 4.890625 26.703125 z -" id="DejaVuSans-34"/> +" id="DejaVuSans-52"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -343,26 +343,26 @@ Q 35.15625 39.890625 26.703125 39.890625 Q 22.75 39.890625 18.8125 39.015625 Q 14.890625 38.140625 10.796875 36.28125 z -" id="DejaVuSans-35"/> +" id="DejaVuSans-53"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -397,26 +397,26 @@ Q 23.390625 74.21875 37.203125 74.21875 Q 40.921875 74.21875 44.703125 73.484375 Q 48.484375 72.75 52.59375 71.296875 z -" id="DejaVuSans-36"/> +" id="DejaVuSans-54"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -430,26 +430,26 @@ L 18.3125 0 L 43.21875 64.59375 L 8.203125 64.59375 z -" id="DejaVuSans-37"/> +" id="DejaVuSans-55"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -493,239 +493,239 @@ Q 38.140625 66.40625 31.78125 66.40625 Q 25.390625 66.40625 21.84375 63.234375 Q 18.3125 60.0625 18.3125 54.390625 z -" id="DejaVuSans-38"/> +" id="DejaVuSans-56"/> - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + @@ -736,362 +736,541 @@ z +" id="m4de4971925" style="stroke:#000000;stroke-width:0.8;"/> - + - + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - +" id="m43f1782402" style="stroke:#808080;stroke-linejoin:miter;"/> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +" id="DejaVuSans-78"/> +" id="DejaVuSans-117"/> +" id="DejaVuSans-109"/> +" id="DejaVuSans-98"/> +" id="DejaVuSans-101"/> - +" id="DejaVuSans-114"/> + +" id="DejaVuSans-111"/> +" id="DejaVuSans-102"/> +" id="DejaVuSans-68"/> +" id="DejaVuSans-97"/> +" id="DejaVuSans-116"/> +" id="DejaVuSans-104"/> +" id="DejaVuSans-115"/> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/figure/num_hospitalizations.svg b/figure/num_hospitalizations.svg index b849ea13e..ab29884a0 100644 --- a/figure/num_hospitalizations.svg +++ b/figure/num_hospitalizations.svg @@ -1,7 +1,7 @@ - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + @@ -295,26 +295,26 @@ L 37.796875 17.1875 L 4.890625 17.1875 L 4.890625 26.703125 z -" id="DejaVuSans-34"/> +" id="DejaVuSans-52"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -343,26 +343,26 @@ Q 35.15625 39.890625 26.703125 39.890625 Q 22.75 39.890625 18.8125 39.015625 Q 14.890625 38.140625 10.796875 36.28125 z -" id="DejaVuSans-35"/> +" id="DejaVuSans-53"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -397,26 +397,26 @@ Q 23.390625 74.21875 37.203125 74.21875 Q 40.921875 74.21875 44.703125 73.484375 Q 48.484375 72.75 52.59375 71.296875 z -" id="DejaVuSans-36"/> +" id="DejaVuSans-54"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -430,26 +430,26 @@ L 18.3125 0 L 43.21875 64.59375 L 8.203125 64.59375 z -" id="DejaVuSans-37"/> +" id="DejaVuSans-55"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -493,239 +493,239 @@ Q 38.140625 66.40625 31.78125 66.40625 Q 25.390625 66.40625 21.84375 63.234375 Q 18.3125 60.0625 18.3125 54.390625 z -" id="DejaVuSans-38"/> +" id="DejaVuSans-56"/> - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + @@ -736,149 +736,149 @@ z +" id="m528f721a35" style="stroke:#000000;stroke-width:0.8;"/> - + - + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - +" id="m41a0f4f25c" style="stroke:#808000;"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +" id="DejaVuSans-78"/> +" id="DejaVuSans-117"/> +" id="DejaVuSans-109"/> +" id="DejaVuSans-98"/> +" id="DejaVuSans-101"/> - +" id="DejaVuSans-114"/> + +" id="DejaVuSans-111"/> +" id="DejaVuSans-102"/> +" id="DejaVuSans-72"/> +" id="DejaVuSans-115"/> +" id="DejaVuSans-112"/> +" id="DejaVuSans-105"/> +" id="DejaVuSans-116"/> +" id="DejaVuSans-97"/> +" id="DejaVuSans-108"/> +" id="DejaVuSans-122"/> +" id="DejaVuSans-110"/> +" id="DejaVuSans-79"/> +" id="DejaVuSans-104"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/figure/num_icu.svg b/figure/num_icu.svg index a3ee2d241..e2781a30e 100644 --- a/figure/num_icu.svg +++ b/figure/num_icu.svg @@ -1,7 +1,7 @@ - + - - - - - - - - - - - + + + + + + + + + + + - + @@ -201,26 +201,26 @@ Q 23.390625 74.21875 37.203125 74.21875 Q 40.921875 74.21875 44.703125 73.484375 Q 48.484375 72.75 52.59375 71.296875 z -" id="DejaVuSans-36"/> +" id="DejaVuSans-54"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -234,26 +234,26 @@ L 18.3125 0 L 43.21875 64.59375 L 8.203125 64.59375 z -" id="DejaVuSans-37"/> +" id="DejaVuSans-55"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -297,26 +297,26 @@ Q 38.140625 66.40625 31.78125 66.40625 Q 25.390625 66.40625 21.84375 63.234375 Q 18.3125 60.0625 18.3125 54.390625 z -" id="DejaVuSans-38"/> +" id="DejaVuSans-56"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -351,48 +351,48 @@ Q 16.21875 57.28125 16.21875 49.421875 Q 16.21875 41.5 20.09375 36.953125 Q 23.96875 32.421875 30.609375 32.421875 z -" id="DejaVuSans-39"/> +" id="DejaVuSans-57"/> - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + @@ -410,26 +410,26 @@ L 54.390625 8.296875 L 54.390625 0 L 12.40625 0 z -" id="DejaVuSans-31"/> +" id="DejaVuSans-49"/> - - - - - - - - - - - + + + + + + + + + + + - + @@ -451,151 +451,151 @@ L 37.796875 17.1875 L 4.890625 17.1875 L 4.890625 26.703125 z -" id="DejaVuSans-34"/> +" id="DejaVuSans-52"/> - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + @@ -606,169 +606,169 @@ z +" id="m5b68f677c8" style="stroke:#000000;stroke-width:0.8;"/> - + - - + + - + - - - + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - +" id="m2fada9dfa6" style="stroke:#d2b48c;"/> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -944,7 +944,7 @@ L 19.390625 60.984375 L 19.390625 0 L 9.8125 0 z -" id="DejaVuSans-4e"/> +" id="DejaVuSans-78"/> +" id="DejaVuSans-117"/> +" id="DejaVuSans-109"/> +" id="DejaVuSans-98"/> +" id="DejaVuSans-101"/> - +" id="DejaVuSans-114"/> + +" id="DejaVuSans-111"/> +" id="DejaVuSans-102"/> +" id="DejaVuSans-73"/> +" id="DejaVuSans-67"/> +" id="DejaVuSans-85"/> +" id="DejaVuSans-97"/> +" id="DejaVuSans-100"/> +" id="DejaVuSans-105"/> +" id="DejaVuSans-115"/> +" id="DejaVuSans-110"/> - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/visualization/python/visualize_daily.py b/visualization/python/visualize_daily.py index f5d32e9c8..e8a60cf67 100644 --- a/visualization/python/visualize_daily.py +++ b/visualization/python/visualize_daily.py @@ -55,12 +55,11 @@ plt.close() - y=df['num_icu'].dropna() # delete NaN entries x=df['date'][len(df['date'])-len(y):] # subarray of dates with num_icu available # plt.figure(figsize=(fig_width, fig_height)) plt.title('Number of ICU admissions') -plt.plot(x, y, marker='.', markersize=12, color='tan', linewidth=2) +plt.plot(x, y, marker='.', markersize=12, color='tan', linewidth=2, label='Total ICU Cases') bottom, top = plt.ylim() plt.ylim(0, top*1.1) #plt.xlabel('Date') @@ -76,28 +75,40 @@ plt.close() +df['num_new_hospitalizations']=df['num_hospitalizations'].diff() # add newly confirmed cases + x=df['date'] y=df['num_hospitalizations'] +z=df['num_new_hospitalizations'] # plt.figure(figsize=(fig_width, fig_height)) plt.title('Number of Hospitalizations in Ohio') -plt.plot(x, y, marker='.', markersize=12, color='olive', linewidth=2) +plt.plot(x, y, marker='.', markersize=12, color='olive', linewidth=2, label='Total Hospitalizations') +plt.plot(x, z, marker='.', markersize=12, color='orange', linewidth=2, label='New Hospitalizations') +plt.legend() bottom, top = plt.ylim() plt.ylim(0, top*1.1) plt.xticks(rotation=rotation_degree) plt.gca().yaxis.set_major_locator(ticker.MaxNLocator(integer=True)) for i,j in zip(x,y): plt.text(i, j, str(j), ha='center', va='bottom') +for i,j in zip(x[1:],z[1:]): + # plt.text(i, j, str(int(j)), size=value_text_size, ha='center', va='bottom') + plt.text(i, j, str(int(j)), ha='center', va='bottom') plt.tight_layout() plt.savefig(num_hospitalizations_file_name) plt.clf() plt.cla() plt.close() +df['num_new_deaths']=df['num_death'].diff() # add newly confirmed cases x=df['date'] y=df['num_death'] +z=df['num_new_deaths'] # plt.figure(figsize=(fig_width, fig_height)) -plt.plot(x, y, marker='^', color='grey', linewidth=2) +plt.plot(x, y, marker='^', color='grey', linewidth=2, label='Total Deaths') +plt.plot(x, z, marker='.', markersize=12, color='orange', linewidth=2, label='New Deaths') +plt.legend() plt.title('Number of Deaths') bottom, top = plt.ylim() plt.ylim(0, top*1.1) @@ -105,11 +116,12 @@ plt.gca().yaxis.set_major_locator(ticker.MaxNLocator(integer=True)) for i,j in zip(x,y): plt.text(i, j, str(j), ha='center', va='bottom') +for i,j in zip(x[1:],z[1:]): + # plt.text(i, j, str(int(j)), size=value_text_size, ha='center', va='bottom') + plt.text(i, j, str(int(j)), ha='center', va='bottom') plt.tight_layout() plt.savefig(num_death_file_name) plt.clf() plt.cla() plt.close() - -