Skip to content

Commit 7b7a7b5

Browse files
committed
Numbers, Struct, NumPy
1 parent be66e8c commit 7b7a7b5

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,8 @@ Numbers
487487
-------
488488
```python
489489
<int> = int(<float/str/bool>) # Or: math.floor(<float>)
490-
<float> = float(<int/str/bool>) # Or: <real>e±<int>
491-
<complex> = complex(real=0, imag=0) # Or: <real> ± <real>j
490+
<float> = float(<int/str/bool>) # Or: <int/float>e±<int>
491+
<complex> = complex(real=0, imag=0) # Or: <int/float/Fraction> ± <int/float>j
492492
<Fraction> = fractions.Fraction(0, 1) # Or: Fraction(numerator=0, denominator=1)
493493
<Decimal> = decimal.Decimal(<str/int>) # Or: Decimal((sign, digits, exponent))
494494
```
@@ -2024,7 +2024,7 @@ b'\x00\x01\x00\x02\x00\x00\x00\x03'
20242024
* **`'l'` - long (4/4)**
20252025
* **`'q'` - long long (8/8)**
20262026

2027-
#### Floating point types:
2027+
#### Floating point types (struct always uses standard sizes):
20282028
* **`'f'` - float (4/4)**
20292029
* **`'d'` - double (8/8)**
20302030

@@ -2646,8 +2646,8 @@ import numpy as np
26462646
```
26472647

26482648
```python
2649-
<array> = np.array(<list/list_of_lists>) # Returns a 1d/2d NumPy array.
2650-
<array> = np.zeros/ones(<shape>) # Also np.full(<shape>, <el>).
2649+
<array> = np.array(<list/list_of_lists/>) # Returns a 1d/2d/… NumPy array.
2650+
<array> = np.zeros/ones/empty(<shape>) # Also np.full(<shape>, <el>).
26512651
<array> = np.arange(from_inc, to_exc, ±step) # Also np.linspace(start, stop, len).
26522652
<array> = np.random.randint(from_inc, to_exc, <shape>) # Also np.random.random(<shape>).
26532653
```

index.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,8 @@
445445
</code></pre></div>
446446

447447
<div><h2 id="numbers"><a href="#numbers" name="numbers">#</a>Numbers</h2><pre><code class="python language-python hljs">&lt;int&gt; = int(&lt;float/str/bool&gt;) <span class="hljs-comment"># Or: math.floor(&lt;float&gt;)</span>
448-
&lt;float&gt; = float(&lt;int/str/bool&gt;) <span class="hljs-comment"># Or: &lt;real&gt;e±&lt;int&gt;</span>
449-
&lt;complex&gt; = complex(real=<span class="hljs-number">0</span>, imag=<span class="hljs-number">0</span>) <span class="hljs-comment"># Or: &lt;real&gt; ± &lt;real&gt;j</span>
448+
&lt;float&gt; = float(&lt;int/str/bool&gt;) <span class="hljs-comment"># Or: &lt;int/float&gt;e±&lt;int&gt;</span>
449+
&lt;complex&gt; = complex(real=<span class="hljs-number">0</span>, imag=<span class="hljs-number">0</span>) <span class="hljs-comment"># Or: &lt;int/float/Fraction&gt; ± &lt;int/float&gt;j</span>
450450
&lt;Fraction&gt; = fractions.Fraction(<span class="hljs-number">0</span>, <span class="hljs-number">1</span>) <span class="hljs-comment"># Or: Fraction(numerator=0, denominator=1)</span>
451451
&lt;Decimal&gt; = decimal.Decimal(&lt;str/int&gt;) <span class="hljs-comment"># Or: Decimal((sign, digits, exponent))</span>
452452
</code></pre></div>
@@ -1669,16 +1669,16 @@ <h3 id="format-2">Format</h3><div><h4 id="forstandardtypesizesandmanualalignment
16691669
</ul><div><h4 id="besidesnumberspackandunpackalsosupportbytesobjectsaspartofthesequence">Besides numbers, pack() and unpack() also support bytes objects as part of the sequence:</h4><ul>
16701670
<li><strong><code class="python hljs"><span class="hljs-string">'c'</span></code> - A bytes object with a single element. For pad byte use <code class="python hljs"><span class="hljs-string">'x'</span></code>.</strong></li>
16711671
<li><strong><code class="apache hljs"><span class="hljs-section">'&lt;n&gt;s'</span><span class="hljs-attribute"></span></code> - A bytes object with n elements.</strong></li>
1672-
</ul></div></div><div><div><h4 id="integertypesuseacapitalletterforunsignedtypeminimumandstandardsizesareinbrackets">Integer types. Use a capital letter for unsigned type. Minimum and standard sizes are in brackets:</h4><ul>
1672+
</ul><div><h4 id="integertypesuseacapitalletterforunsignedtypeminimumandstandardsizesareinbrackets">Integer types. Use a capital letter for unsigned type. Minimum and standard sizes are in brackets:</h4><ul>
16731673
<li><strong><code class="python hljs"><span class="hljs-string">'b'</span></code> - char (1/1)</strong></li>
16741674
<li><strong><code class="python hljs"><span class="hljs-string">'h'</span></code> - short (2/2)</strong></li>
16751675
<li><strong><code class="python hljs"><span class="hljs-string">'i'</span></code> - int (2/4)</strong></li>
16761676
<li><strong><code class="python hljs"><span class="hljs-string">'l'</span></code> - long (4/4)</strong></li>
16771677
<li><strong><code class="python hljs"><span class="hljs-string">'q'</span></code> - long long (8/8)</strong></li>
1678-
</ul></div><div><h4 id="floatingpointtypes">Floating point types:</h4><ul>
1678+
</ul><div><h4 id="floatingpointtypesstructalwaysusesstandardsizes">Floating point types (struct always uses standard sizes):</h4><ul>
16791679
<li><strong><code class="python hljs"><span class="hljs-string">'f'</span></code> - float (4/4)</strong></li>
16801680
<li><strong><code class="python hljs"><span class="hljs-string">'d'</span></code> - double (8/8)</strong></li>
1681-
</ul></div></div>
1681+
</ul></div></div></div></div><div></div>
16821682

16831683

16841684

@@ -2167,8 +2167,8 @@ <h3 id="format-2">Format</h3><div><h4 id="forstandardtypesizesandmanualalignment
21672167
</code></pre></div>
21682168

21692169

2170-
<pre><code class="python language-python hljs">&lt;array&gt; = np.array(&lt;list/list_of_lists&gt;) <span class="hljs-comment"># Returns a 1d/2d NumPy array.</span>
2171-
&lt;array&gt; = np.zeros/ones(&lt;shape&gt;) <span class="hljs-comment"># Also np.full(&lt;shape&gt;, &lt;el&gt;).</span>
2170+
<pre><code class="python language-python hljs">&lt;array&gt; = np.array(&lt;list/list_of_lists/…&gt;) <span class="hljs-comment"># Returns a 1d/2d/… NumPy array.</span>
2171+
&lt;array&gt; = np.zeros/ones/empty(&lt;shape&gt;) <span class="hljs-comment"># Also np.full(&lt;shape&gt;, &lt;el&gt;).</span>
21722172
&lt;array&gt; = np.arange(from_inc, to_exc, ±step) <span class="hljs-comment"># Also np.linspace(start, stop, len).</span>
21732173
&lt;array&gt; = np.random.randint(from_inc, to_exc, &lt;shape&gt;) <span class="hljs-comment"># Also np.random.random(&lt;shape&gt;).</span>
21742174
</code></pre>

0 commit comments

Comments
 (0)