Skip to content

Commit ca19a7a

Browse files
gto76gto76
committed
Update of NumPy and Pandas
1 parent 4ce2f4d commit ca19a7a

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2685,7 +2685,7 @@ import numpy as np
26852685
```
26862686

26872687
```perl
2688-
<2d_bools> = <2d_array> ><== <el/1d/2d_array> # 1d_array must have size of a row.
2688+
<2d_bools> = <2d_array> > <el/1d/2d_array> # 1d_array must have size of a row.
26892689
<1d/2d_a> = <2d_array>[<2d/1d_bools>] # 1d_bools must have size of a column.
26902690
```
26912691
* **Indexes should not be tuples because Python converts `'obj[i, j]'` to `'obj[(i, j)]'`!**
@@ -3161,8 +3161,8 @@ Name: a, dtype: int64
31613161
```
31623162

31633163
```python
3164-
<Sr> = <Sr> ><== <el/Sr> # Returns a Series of bools.
3165-
<Sr> = <Sr> +-*/ <el/Sr> # Items with non-matching keys get value NaN.
3164+
<Sr> = <Sr> > <el/Sr> # Returns a Series of bools.
3165+
<Sr> = <Sr> + <el/Sr> # Items with non-matching keys get value NaN.
31663166
```
31673167

31683168
```python
@@ -3236,19 +3236,19 @@ b 3 4
32363236
```python
32373237
<Sr/DF> = <DF>[column_key/s] # Or: <DF>.column_key
32383238
<DF> = <DF>[row_bools] # Keeps rows as specified by bools.
3239-
<DF> = <DF>[<DF_of_bools>] # Assigns NaN to False values.
3239+
<DF> = <DF>[<DF_of_bools>] # Assigns NaN to values that are False in bools.
32403240
```
32413241

32423242
```python
3243-
<DF> = <DF> ><== <el/Sr/DF> # Returns DF of bools. Sr is treated as a row.
3244-
<DF> = <DF> +-*/ <el/Sr/DF> # Items with non-matching keys get value NaN.
3243+
<DF> = <DF> > <el/Sr/DF> # Returns DF of bools. Sr is treated as a row.
3244+
<DF> = <DF> + <el/Sr/DF> # Items with non-matching keys get value NaN.
32453245
```
32463246

32473247
```python
3248-
<DF> = <DF>.set_index(column_key) # Replaces row keys with values from a column.
3248+
<DF> = <DF>.set_index(column_key) # Replaces row keys with values from the column.
32493249
<DF> = <DF>.reset_index(drop=False) # Drops or moves row keys to column named index.
32503250
<DF> = <DF>.sort_index(ascending=True) # Sorts rows by row keys. Use `axis=1` for cols.
3251-
<DF> = <DF>.sort_values(column_key/s) # Sorts rows by the passed column/s. Same.
3251+
<DF> = <DF>.sort_values(column_key/s) # Sorts rows by passed column/s. Also `axis=1`.
32523252
```
32533253

32543254
#### DataFrame — Merge, Join, Concat:

‎index.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
<body>
5656
<header>
57-
<aside>September 16, 2023</aside>
57+
<aside>September 17, 2023</aside>
5858
<a href="https://gto76.github.io" rel="author">Jure Šorn</a>
5959
</header>
6060

@@ -2196,7 +2196,7 @@ <h3 id="format-2">Format</h3><div><h4 id="forstandardtypesizesandmanualalignment
21962196
&lt;1d_array&gt; = &lt;2d_array&gt;[row_indexes, column_indexes] <span class="hljs-comment"># &lt;3d_a&gt;[table_i/is, row_is, column_is]</span>
21972197
&lt;1d_array&gt; = &lt;2d_array&gt;[row_indexes, column_index] <span class="hljs-comment"># &lt;3d_a&gt;[table_i/is, row_is, column_i]</span>
21982198
</code></pre>
2199-
<pre><code class="bash hljs">&lt;2d_bools&gt; = &lt;2d_array&gt; &gt;&lt;== &lt;el/1d/2d_array&gt; <span class="hljs-comment"># 1d_array must have size of a row.</span>
2199+
<pre><code class="bash hljs">&lt;2d_bools&gt; = &lt;2d_array&gt; &gt; &lt;el/1d/2d_array&gt; <span class="hljs-comment"># 1d_array must have size of a row.</span>
22002200
&lt;1d/2d_a&gt; = &lt;2d_array&gt;[&lt;2d/1d_bools&gt;] <span class="hljs-comment"># 1d_bools must have size of a column.</span>
22012201
</code></pre>
22022202
<ul>
@@ -2584,8 +2584,8 @@ <h3 id="format-2">Format</h3><div><h4 id="forstandardtypesizesandmanualalignment
25842584
&lt;Sr&gt; = &lt;Sr&gt;[keys/indexes] <span class="hljs-comment"># Or: &lt;Sr&gt;[&lt;keys_slice/slice&gt;]</span>
25852585
&lt;Sr&gt; = &lt;Sr&gt;[bools] <span class="hljs-comment"># Or: &lt;Sr&gt;.loc/iloc[bools]</span>
25862586
</code></pre>
2587-
<pre><code class="python language-python hljs">&lt;Sr&gt; = &lt;Sr&gt; &gt;&lt;== &lt;el/Sr&gt; <span class="hljs-comment"># Returns a Series of bools.</span>
2588-
&lt;Sr&gt; = &lt;Sr&gt; +-*/ &lt;el/Sr&gt; <span class="hljs-comment"># Items with non-matching keys get value NaN.</span>
2587+
<pre><code class="python language-python hljs">&lt;Sr&gt; = &lt;Sr&gt; &gt; &lt;el/Sr&gt; <span class="hljs-comment"># Returns a Series of bools.</span>
2588+
&lt;Sr&gt; = &lt;Sr&gt; + &lt;el/Sr&gt; <span class="hljs-comment"># Items with non-matching keys get value NaN.</span>
25892589
</code></pre>
25902590
<pre><code class="python language-python hljs">&lt;Sr&gt; = pd.concat(&lt;coll_of_Sr&gt;) <span class="hljs-comment"># Concats multiple Series into one long Series.</span>
25912591
&lt;Sr&gt; = &lt;Sr&gt;.combine_first(&lt;Sr&gt;) <span class="hljs-comment"># Adds items that are not yet present.</span>
@@ -2641,15 +2641,15 @@ <h3 id="format-2">Format</h3><div><h4 id="forstandardtypesizesandmanualalignment
26412641
</code></pre>
26422642
<pre><code class="python language-python hljs">&lt;Sr/DF&gt; = &lt;DF&gt;[column_key/s] <span class="hljs-comment"># Or: &lt;DF&gt;.column_key</span>
26432643
&lt;DF&gt; = &lt;DF&gt;[row_bools] <span class="hljs-comment"># Keeps rows as specified by bools.</span>
2644-
&lt;DF&gt; = &lt;DF&gt;[&lt;DF_of_bools&gt;] <span class="hljs-comment"># Assigns NaN to False values.</span>
2644+
&lt;DF&gt; = &lt;DF&gt;[&lt;DF_of_bools&gt;] <span class="hljs-comment"># Assigns NaN to values that are False in bools.</span>
26452645
</code></pre>
2646-
<pre><code class="python language-python hljs">&lt;DF&gt; = &lt;DF&gt; &gt;&lt;== &lt;el/Sr/DF&gt; <span class="hljs-comment"># Returns DF of bools. Sr is treated as a row.</span>
2647-
&lt;DF&gt; = &lt;DF&gt; +-*/ &lt;el/Sr/DF&gt; <span class="hljs-comment"># Items with non-matching keys get value NaN.</span>
2646+
<pre><code class="python language-python hljs">&lt;DF&gt; = &lt;DF&gt; &gt; &lt;el/Sr/DF&gt; <span class="hljs-comment"># Returns DF of bools. Sr is treated as a row.</span>
2647+
&lt;DF&gt; = &lt;DF&gt; + &lt;el/Sr/DF&gt; <span class="hljs-comment"># Items with non-matching keys get value NaN.</span>
26482648
</code></pre>
2649-
<pre><code class="python language-python hljs">&lt;DF&gt; = &lt;DF&gt;.set_index(column_key) <span class="hljs-comment"># Replaces row keys with values from a column.</span>
2649+
<pre><code class="python language-python hljs">&lt;DF&gt; = &lt;DF&gt;.set_index(column_key) <span class="hljs-comment"># Replaces row keys with values from the column.</span>
26502650
&lt;DF&gt; = &lt;DF&gt;.reset_index(drop=<span class="hljs-keyword">False</span>) <span class="hljs-comment"># Drops or moves row keys to column named index.</span>
26512651
&lt;DF&gt; = &lt;DF&gt;.sort_index(ascending=<span class="hljs-keyword">True</span>) <span class="hljs-comment"># Sorts rows by row keys. Use `axis=1` for cols.</span>
2652-
&lt;DF&gt; = &lt;DF&gt;.sort_values(column_key/s) <span class="hljs-comment"># Sorts rows by the passed column/s. Same.</span>
2652+
&lt;DF&gt; = &lt;DF&gt;.sort_values(column_key/s) <span class="hljs-comment"># Sorts rows by passed column/s. Also `axis=1`.</span>
26532653
</code></pre>
26542654
<div><h4 id="dataframemergejoinconcat">DataFrame — Merge, Join, Concat:</h4><pre><code class="python language-python hljs"><span class="hljs-meta">&gt;&gt;&gt; </span>l = pd.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>])
26552655
x y
@@ -2928,7 +2928,7 @@ <h3 id="format-2">Format</h3><div><h4 id="forstandardtypesizesandmanualalignment
29282928

29292929

29302930
<footer>
2931-
<aside>September 16, 2023</aside>
2931+
<aside>September 17, 2023</aside>
29322932
<a href="https://gto76.github.io" rel="author">Jure Šorn</a>
29332933
</footer>
29342934

‎parse.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ function changeCodeLanguages() {
791791
$('code').not('.python').not('.text').not('.bash').not('.apache').addClass('python');
792792
$('code:contains(<el> = <2d_array>[row_index, column_index])').removeClass().addClass('bash');
793793
$('code:contains(<2d_array> = <2d_array>[row_indexes])').removeClass().addClass('bash');
794-
$('code:contains(<2d_bools> = <2d_array> ><== <el/1d/2d_array>)').removeClass().addClass('bash');
794+
$('code:contains(<2d_bools> = <2d_array> > <el/1d/2d_array>)').removeClass().addClass('bash');
795795
$('code.perl').removeClass().addClass('python');
796796
}
797797

0 commit comments

Comments
 (0)