Skip to content

Commit ebee0dc

Browse files
gto76gto76
committed
Pandas
1 parent 14d2979 commit ebee0dc

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3143,7 +3143,7 @@ y 2
31433143
| sr.trans(…) | y 2 | y 2 | y 2 |
31443144
+-------------+-------------+-------------+---------------+
31453145
```
3146-
* **Last result has a hierarchical index. `'<Sr>[<key_1>, <key_2>]'` returns the value.**
3146+
* **Last result has a hierarchical index. Use `'<Sr>[<key_1>, <key_2>]'` to get the value.**
31473147

31483148
### DataFrame
31493149
**Table with labeled rows and columns.**
@@ -3387,12 +3387,12 @@ def scrape_data():
33873387
covid = pd.read_csv('https://covid.ourworldindata.org/data/owid-covid-data.csv',
33883388
usecols=['date', 'total_cases'])
33893389
covid = covid.groupby('date').sum()
3390-
dow, gold, bitcoin = [scrape_yahoo(id_) for id_ in ('^DJI', 'GC=F', 'BTC-USD')]
3391-
dow.name, gold.name, bitcoin.name = 'Dow Jones', 'Gold', 'Bitcoin'
3392-
return covid, dow, gold, bitcoin
3390+
dow, gold, btc = [scrape_yahoo(id_) for id_ in ('^DJI', 'GC=F', 'BTC-USD')]
3391+
dow.name, gold.name, btc.name = 'Dow Jones', 'Gold', 'Bitcoin'
3392+
return covid, dow, gold, btc
33933393

3394-
def wrangle_data(covid, dow, gold, bitcoin):
3395-
df = pandas.concat([covid, dow, gold, bitcoin], axis=1)
3394+
def wrangle_data(covid, dow, gold, btc):
3395+
df = pandas.concat([covid, dow, gold, btc], axis=1)
33963396
df = df.loc['2020-02-23':].iloc[:-2]
33973397
df = df.interpolate()
33983398
df.iloc[:, 1:] = df.rolling(10, min_periods=1, center=True).mean().iloc[:, 1:]

‎index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2681,7 +2681,7 @@
26812681
┗━━━━━━━━━━━━━┷━━━━━━━━━━━━━┷━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━┛
26822682
</code></pre>
26832683
<ul>
2684-
<li><strong>Last result has a hierarchical index. <code class="python hljs"><span class="hljs-string">'&lt;Sr&gt;[&lt;key_1&gt;, &lt;key_2&gt;]'</span></code> returns the value.</strong></li>
2684+
<li><strong>Last result has a hierarchical index. Use <code class="python hljs"><span class="hljs-string">'&lt;Sr&gt;[&lt;key_1&gt;, &lt;key_2&gt;]'</span></code> to get the value.</strong></li>
26852685
</ul>
26862686
<div><h3 id="dataframe">DataFrame</h3><p><strong>Table with labeled rows and columns.</strong></p><pre><code class="python language-python hljs"><span class="hljs-meta">&gt;&gt;&gt; </span>DataFrame([[<span class="hljs-number">1</span>, <span class="hljs-number">2</span>], [<span class="hljs-number">3</span>, <span class="hljs-number">4</span>]], index=[<span class="hljs-string">'a'</span>, <span class="hljs-string">'b'</span>], columns=[<span class="hljs-string">'x'</span>, <span class="hljs-string">'y'</span>])
26872687
x y
@@ -2871,12 +2871,12 @@
28712871
covid = pd.read_csv(<span class="hljs-string">'https://covid.ourworldindata.org/data/owid-covid-data.csv'</span>,
28722872
usecols=[<span class="hljs-string">'date'</span>, <span class="hljs-string">'total_cases'</span>])
28732873
covid = covid.groupby(<span class="hljs-string">'date'</span>).sum()
2874-
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>)]
2875-
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>
2876-
<span class="hljs-keyword">return</span> covid, dow, gold, bitcoin
2874+
dow, gold, btc = [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>)]
2875+
dow.name, gold.name, btc.name = <span class="hljs-string">'Dow Jones'</span>, <span class="hljs-string">'Gold'</span>, <span class="hljs-string">'Bitcoin'</span>
2876+
<span class="hljs-keyword">return</span> covid, dow, gold, btc
28772877

2878-
<span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">wrangle_data</span><span class="hljs-params">(covid, dow, gold, bitcoin)</span>:</span>
2879-
df = pandas.concat([covid, dow, gold, bitcoin], axis=<span class="hljs-number">1</span>)
2878+
<span class="hljs-function"><span class="hljs-keyword">def</span> <span class="hljs-title">wrangle_data</span><span class="hljs-params">(covid, dow, gold, btc)</span>:</span>
2879+
df = pandas.concat([covid, dow, gold, btc], axis=<span class="hljs-number">1</span>)
28802880
df = df.loc[<span class="hljs-string">'2020-02-23'</span>:].iloc[:<span class="hljs-number">-2</span>]
28812881
df = df.interpolate()
28822882
df.iloc[:, <span class="hljs-number">1</span>:] = df.rolling(<span class="hljs-number">10</span>, min_periods=<span class="hljs-number">1</span>, center=<span class="hljs-keyword">True</span>).mean().iloc[:, <span class="hljs-number">1</span>:]

‎pdf/index_for_pdf.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ <h3 id="r">R</h3>
121121
<strong>regular expressions, <a href="#regex">5</a>-<a href="#specialsequences">6</a></strong><br>
122122
<strong>requests library, <a href="#scraping">35</a>, <a href="#test">36</a></strong> </p>
123123
<h3 id="s">S</h3>
124-
<p><strong>scraping, <a href="#scraping">35</a>, <a href="#basicmariobrothersexample">43</a>, <a href="#plotly">47</a>, <a href="#confirmedcovidcasesdowjonesgoldandbitcoinprice">48</a></strong><br>
124+
<p><strong>scraping, <a href="#scraping">35</a>, <a href="#basicmariobrothersexample">43</a>, <a href="#encodedecode">46</a>, <a href="#plotly">47</a>, <a href="#confirmedcovidcasesdowjonesgoldandbitcoinprice">48</a></strong><br>
125125
<strong>sequence, <a href="#type">4</a>, <a href="#sequence">18</a>, <a href="#abcsequence">19</a></strong><br>
126126
<strong>sets, <a href="#set">2</a>, <a href="#otheruses">11</a></strong><br>
127127
<strong>shell commands, <a href="#shellcommands">25</a></strong><br>

‎pdf/index_for_pdf_print.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ <h3 id="r">R</h3>
121121
<strong>regular expressions, 5-6</strong><br>
122122
<strong>requests library, 35, 36</strong> </p>
123123
<h3 id="s">S</h3>
124-
<p><strong>scraping, 35, 43, 47, 48</strong><br>
124+
<p><strong>scraping, 35, 43, 46, 47, 48</strong><br>
125125
<strong>sequence, 4, 18, 19</strong><br>
126126
<strong>sets, 2, 11</strong><br>
127127
<strong>shell commands, 25</strong><br>

0 commit comments

Comments
 (0)