Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3ea47fa

Browse files
committed
Fixed confirmed covid cases plot
1 parent 22b9d3c commit 3ea47fa

File tree

7 files changed

+353
-293
lines changed

7 files changed

+353
-293
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3367,7 +3367,7 @@ continents = pd.read_csv('https://datahub.io/JohnSnowLabs/country-and-continent-
33673367
df = pd.merge(covid, continents, left_on='iso_code', right_on='Three_Letter_Country_Code')
33683368
df = df.groupby(['Continent_Name', 'date']).sum().reset_index()
33693369
df['Total Deaths per Million'] = df.total_deaths * 1e6 / df.population
3370-
df = df[('2020-03-14' < df.date) & (df.date < '2020-10-23')]
3370+
df = df[('2020-03-14' < df.date) & (df.date < '2020-10-26')]
33713371
df = df.rename({'date': 'Date', 'Continent_Name': 'Continent'}, axis='columns')
33723372
line(df, x='Date', y='Total Deaths per Million', color='Continent').show()
33733373
```
@@ -3392,8 +3392,8 @@ def scrape_data():
33923392
url = f'{BASE_URL}{id_}?period1=1579651200&period2={now}&interval=1d&events=history'
33933393
return pd.read_csv(url, usecols=['Date', 'Close']).set_index('Date').Close
33943394
covid = pd.read_csv('https://covid.ourworldindata.org/data/owid-covid-data.csv',
3395-
usecols=['date', 'total_cases'])
3396-
covid = covid.groupby('date').sum()
3395+
usecols=['location', 'date', 'total_cases'])
3396+
covid = covid[covid.location == 'World'].set_index('date').total_cases
33973397
dow, gold, bitcoin = [scrape_yahoo(id_) for id_ in ('^DJI', 'GC=F', 'BTC-USD')]
33983398
dow.name, gold.name, bitcoin.name = 'Dow Jones', 'Gold', 'Bitcoin'
33993399
return covid, dow, gold, bitcoin

index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2858,7 +2858,7 @@
28582858
df = pd.merge(covid, continents, left_on=<span class="hljs-string">'iso_code'</span>, right_on=<span class="hljs-string">'Three_Letter_Country_Code'</span>)
28592859
df = df.groupby([<span class="hljs-string">'Continent_Name'</span>, <span class="hljs-string">'date'</span>]).sum().reset_index()
28602860
df[<span class="hljs-string">'Total Deaths per Million'</span>] = df.total_deaths * <span class="hljs-number">1e6</span> / df.population
2861-
df = df[(<span class="hljs-string">'2020-03-14'</span> &lt; df.date) &amp; (df.date &lt; <span class="hljs-string">'2020-10-23'</span>)]
2861+
df = df[(<span class="hljs-string">'2020-03-14'</span> &lt; df.date) &amp; (df.date &lt; <span class="hljs-string">'2020-10-26'</span>)]
28622862
df = df.rename({<span class="hljs-string">'date'</span>: <span class="hljs-string">'Date'</span>, <span class="hljs-string">'Continent_Name'</span>: <span class="hljs-string">'Continent'</span>}, axis=<span class="hljs-string">'columns'</span>)
28632863
line(df, x=<span class="hljs-string">'Date'</span>, y=<span class="hljs-string">'Total Deaths per Million'</span>, color=<span class="hljs-string">'Continent'</span>).show()
28642864
</code></pre></div>
@@ -2879,8 +2879,8 @@
28792879
url = <span class="hljs-string">f'<span class="hljs-subst">{BASE_URL}</span><span class="hljs-subst">{id_}</span>?period1=1579651200&amp;period2=<span class="hljs-subst">{now}</span>&amp;interval=1d&amp;events=history'</span>
28802880
<span class="hljs-keyword">return</span> pd.read_csv(url, usecols=[<span class="hljs-string">'Date'</span>, <span class="hljs-string">'Close'</span>]).set_index(<span class="hljs-string">'Date'</span>).Close
28812881
covid = pd.read_csv(<span class="hljs-string">'https://covid.ourworldindata.org/data/owid-covid-data.csv'</span>,
2882-
usecols=[<span class="hljs-string">'date'</span>, <span class="hljs-string">'total_cases'</span>])
2883-
covid = covid.groupby(<span class="hljs-string">'date'</span>).sum()
2882+
usecols=[<span class="hljs-string">'location'</span>, <span class="hljs-string">'date'</span>, <span class="hljs-string">'total_cases'</span>])
2883+
covid = covid[covid.location == <span class="hljs-string">'World'</span>].set_index(<span class="hljs-string">'date'</span>).total_cases
28842884
dow, gold, bitcoin = [scrape_yahoo(id_) <span class="hljs-keyword">for</span> id_ <span class="hljs-keyword">in</span> (<span class="hljs-string">'^DJI'</span>, <span class="hljs-string">'GC=F'</span>, <span class="hljs-string">'BTC-USD'</span>)]
28852885
dow.name, gold.name, bitcoin.name = <span class="hljs-string">'Dow Jones'</span>, <span class="hljs-string">'Gold'</span>, <span class="hljs-string">'Bitcoin'</span>
28862886
<span class="hljs-keyword">return</span> covid, dow, gold, bitcoin

0 commit comments

Comments
 (0)