Skip to content

Commit 6b37190

Browse files
rougierrougier
committed
Removed 'Declare' in favor of 'Create' and put attriubtion on Expert rougier#2 
1 parent e7685de commit 6b37190

2 files changed

Lines changed: 16 additions & 12 deletions

File tree

‎README.html‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,17 @@ <h1><a class="toc-backref" href="#id1">Neophyte</a></h1>
8787
<span class="name">nz</span> <span class="operator">=</span> <span class="name">np</span><span class="operator">.</span><span class="name">nonzero</span><span class="punctuation">([</span><span class="literal number integer">1</span><span class="punctuation">,</span><span class="literal number integer">2</span><span class="punctuation">,</span><span class="literal number integer">0</span><span class="punctuation">,</span><span class="literal number integer">0</span><span class="punctuation">,</span><span class="literal number integer">4</span><span class="punctuation">,</span><span class="literal number integer">0</span><span class="punctuation">])</span>
8888
</pre>
8989
</li>
90-
<li><p class="first">Declare a 3x3 identity matrix</p>
90+
<li><p class="first">Create a 3x3 identity matrix</p>
9191
<pre class="code python literal-block">
9292
<span class="name">Z</span> <span class="operator">=</span> <span class="name">np</span><span class="operator">.</span><span class="name">eye</span><span class="punctuation">(</span><span class="literal number integer">3</span><span class="punctuation">)</span>
9393
</pre>
9494
</li>
95-
<li><p class="first">Declare a 5x5 matrix with values 1,2,3,4 just below the diagonal</p>
95+
<li><p class="first">Create a 5x5 matrix with values 1,2,3,4 just below the diagonal</p>
9696
<pre class="code python literal-block">
9797
<span class="name">Z</span> <span class="operator">=</span> <span class="name">np</span><span class="operator">.</span><span class="name">diag</span><span class="punctuation">(</span><span class="literal number integer">1</span><span class="operator">+</span><span class="name">np</span><span class="operator">.</span><span class="name">arange</span><span class="punctuation">(</span><span class="literal number integer">4</span><span class="punctuation">),</span><span class="name">k</span><span class="operator">=-</span><span class="literal number integer">1</span><span class="punctuation">)</span>
9898
</pre>
9999
</li>
100-
<li><p class="first">Declare a 10x10x10 array with random values</p>
100+
<li><p class="first">Create a 10x10x10 array with random values</p>
101101
<pre class="code python literal-block">
102102
<span class="name">Z</span> <span class="operator">=</span> <span class="name">np</span><span class="operator">.</span><span class="name">random</span><span class="operator">.</span><span class="name">random</span><span class="punctuation">((</span><span class="literal number integer">10</span><span class="punctuation">,</span><span class="literal number integer">10</span><span class="punctuation">,</span><span class="literal number integer">10</span><span class="punctuation">))</span>
103103
</pre>
@@ -107,14 +107,14 @@ <h1><a class="toc-backref" href="#id1">Neophyte</a></h1>
107107
<div class="section" id="novice">
108108
<h1><a class="toc-backref" href="#id2">Novice</a></h1>
109109
<ol class="arabic">
110-
<li><p class="first">Declare a 8x8 matrix and fill it with a checkerboard pattern</p>
110+
<li><p class="first">Create a 8x8 matrix and fill it with a checkerboard pattern</p>
111111
<pre class="code python literal-block">
112112
<span class="name">Z</span> <span class="operator">=</span> <span class="name">np</span><span class="operator">.</span><span class="name">zeros</span><span class="punctuation">((</span><span class="literal number integer">8</span><span class="punctuation">,</span><span class="literal number integer">8</span><span class="punctuation">))</span>
113113
<span class="name">Z</span><span class="punctuation">[</span><span class="literal number integer">1</span><span class="punctuation">::</span><span class="literal number integer">2</span><span class="punctuation">,::</span><span class="literal number integer">2</span><span class="punctuation">]</span> <span class="operator">=</span> <span class="literal number integer">1</span>
114114
<span class="name">Z</span><span class="punctuation">[::</span><span class="literal number integer">2</span><span class="punctuation">,</span><span class="literal number integer">1</span><span class="punctuation">::</span><span class="literal number integer">2</span><span class="punctuation">]</span> <span class="operator">=</span> <span class="literal number integer">1</span>
115115
</pre>
116116
</li>
117-
<li><p class="first">Declare a 10x10 array with random values and find the minimum and maximum values</p>
117+
<li><p class="first">Create a 10x10 array with random values and find the minimum and maximum values</p>
118118
<pre class="code python literal-block">
119119
<span class="name">Z</span> <span class="operator">=</span> <span class="name">np</span><span class="operator">.</span><span class="name">random</span><span class="operator">.</span><span class="name">random</span><span class="punctuation">((</span><span class="literal number integer">10</span><span class="punctuation">,</span><span class="literal number integer">10</span><span class="punctuation">))</span>
120120
<span class="name">Zmin</span><span class="punctuation">,</span> <span class="name">Zmax</span> <span class="operator">=</span> <span class="name">Z</span><span class="operator">.</span><span class="name">min</span><span class="punctuation">(),</span> <span class="name">Z</span><span class="operator">.</span><span class="name">max</span><span class="punctuation">()</span>
@@ -193,7 +193,7 @@ <h1><a class="toc-backref" href="#id3">Apprentice</a></h1>
193193
<span class="name">Z</span><span class="punctuation">[</span><span class="name">Z</span><span class="operator">.</span><span class="name">argmax</span><span class="punctuation">()]</span> <span class="operator">=</span> <span class="literal number integer">0</span>
194194
</pre>
195195
</li>
196-
<li><p class="first">Declare a structured array with <tt class="docutils literal">x</tt> and <tt class="docutils literal">y</tt> coordinates covering the
196+
<li><p class="first">Create a structured array with <tt class="docutils literal">x</tt> and <tt class="docutils literal">y</tt> coordinates covering the
197197
[0,1]x[0,1] area.</p>
198198
<pre class="code python literal-block">
199199
<span class="name">Z</span> <span class="operator">=</span> <span class="name">np</span><span class="operator">.</span><span class="name">zeros</span><span class="punctuation">((</span><span class="literal number integer">10</span><span class="punctuation">,</span><span class="literal number integer">10</span><span class="punctuation">),</span> <span class="punctuation">[(</span><span class="literal string">'x'</span><span class="punctuation">,</span><span class="name builtin">float</span><span class="punctuation">),(</span><span class="literal string">'y'</span><span class="punctuation">,</span><span class="name builtin">float</span><span class="punctuation">)])</span>
@@ -459,6 +459,8 @@ <h1><a class="toc-backref" href="#id8">Expert</a></h1>
459459
</li>
460460
<li><p class="first">Extract all the contiguous 3x3 blocks from a random 10x10 matrix.</p>
461461
<pre class="code python literal-block">
462+
<span class="comment"># Chris Barker</span>
463+
462464
<span class="name">Z</span> <span class="operator">=</span> <span class="name">np</span><span class="operator">.</span><span class="name">random</span><span class="operator">.</span><span class="name">randint</span><span class="punctuation">(</span><span class="literal number integer">0</span><span class="punctuation">,</span><span class="literal number integer">5</span><span class="punctuation">,(</span><span class="literal number integer">10</span><span class="punctuation">,</span><span class="literal number integer">10</span><span class="punctuation">))</span>
463465
<span class="name">n</span> <span class="operator">=</span> <span class="literal number integer">3</span>
464466
<span class="name">i</span> <span class="operator">=</span> <span class="literal number integer">1</span> <span class="operator">+</span> <span class="punctuation">(</span><span class="name">Z</span><span class="operator">.</span><span class="name">shape</span><span class="punctuation">[</span><span class="literal number integer">0</span><span class="punctuation">]</span><span class="operator">-</span><span class="literal number integer">3</span><span class="punctuation">)</span>

‎README.rst‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,20 @@ Neophyte
8686
nz = np.nonzero([1,2,0,0,4,0])
8787
8888
89-
8. Declare a 3x3 identity matrix
89+
8. Create a 3x3 identity matrix
9090

9191
.. code:: python
9292
9393
Z = np.eye(3)
9494
95-
9. Declare a 5x5 matrix with values 1,2,3,4 just below the diagonal
95+
9. Create a 5x5 matrix with values 1,2,3,4 just below the diagonal
9696

9797
.. code:: python
9898
9999
Z = np.diag(1+np.arange(4),k=-1)
100100
101101
102-
10. Declare a 10x10x10 array with random values
102+
10. Create a 10x10x10 array with random values
103103

104104
.. code:: python
105105
@@ -108,15 +108,15 @@ Neophyte
108108
Novice
109109
======
110110

111-
1. Declare a 8x8 matrix and fill it with a checkerboard pattern
111+
1. Create a 8x8 matrix and fill it with a checkerboard pattern
112112

113113
.. code:: python
114114
115115
Z = np.zeros((8,8))
116116
Z[1::2,::2] = 1
117117
Z[::2,1::2] = 1
118118
119-
2. Declare a 10x10 array with random values and find the minimum and maximum values
119+
2. Create a 10x10 array with random values and find the minimum and maximum values
120120

121121
.. code:: python
122122
@@ -213,7 +213,7 @@ Apprentice
213213
Z[Z.argmax()] = 0
214214
215215
216-
4. Declare a structured array with ``x`` and ``y`` coordinates covering the
216+
4. Create a structured array with ``x`` and ``y`` coordinates covering the
217217
[0,1]x[0,1] area.
218218

219219
.. code:: python
@@ -520,6 +520,8 @@ Expert
520520

521521
.. code:: python
522522
523+
# Chris Barker
524+
523525
Z = np.random.randint(0,5,(10,10))
524526
n = 3
525527
i = 1 + (Z.shape[0]-3)

0 commit comments

Comments
 (0)