Removed 'Declare' in favor of 'Create' and put attriubtion on Expert #2

6b3719063ae25e9d79c32c6a6e08f076cb82b9d6 · Nicolas Rougier · May 27, 2014 21:20
+16 −12 · 2 files changed
README.html +8 −6
README.rst +8 −6
diff --git a/README.html b/README.html
index 7b70fab..c2ba4ff 100644
--- a/README.html
+++ b/README.html
@@ -87,17 +87,17 @@ is:</p>
 <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>
 </pre>
 </li>
-<li><p class="first">Declare a 3x3 identity matrix</p>
+<li><p class="first">Create a 3x3 identity matrix</p>
 <pre class="code python literal-block">
 <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>
 </pre>
 </li>
-<li><p class="first">Declare a 5x5 matrix with values 1,2,3,4 just below the diagonal</p>
+<li><p class="first">Create a 5x5 matrix with values 1,2,3,4 just below the diagonal</p>
 <pre class="code python literal-block">
 <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>
 </pre>
 </li>
-<li><p class="first">Declare a 10x10x10 array with random values</p>
+<li><p class="first">Create a 10x10x10 array with random values</p>
 <pre class="code python literal-block">
 <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>
 </pre>
@@ -107,14 +107,14 @@ is:</p>
 <div class="section" id="novice">
 <h1><a class="toc-backref" href="#id2">Novice</a></h1>
 <ol class="arabic">
-<li><p class="first">Declare a 8x8 matrix and fill it with a checkerboard pattern</p>
+<li><p class="first">Create a 8x8 matrix and fill it with a checkerboard pattern</p>
 <pre class="code python literal-block">
 <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>
 <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>
 <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>
 </pre>
 </li>
-<li><p class="first">Declare a 10x10 array with random values and find the minimum and maximum values</p>
+<li><p class="first">Create a 10x10 array with random values and find the minimum and maximum values</p>
 <pre class="code python literal-block">
 <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="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 @@ them to polar coordinates</p>
 <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>
 </pre>
 </li>
-<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
+<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
 [0,1]x[0,1] area.</p>
 <pre class="code python literal-block">
 <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 @@ in B ?</p>
 </li>
 <li><p class="first">Extract all the contiguous 3x3 blocks from a random 10x10 matrix.</p>
 <pre class="code python literal-block">
+<span class="comment"># Chris Barker</span>
+
 <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>
 <span class="name">n</span> <span class="operator">=</span> <span class="literal number integer">3</span>
 <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>
diff --git a/README.rst b/README.rst
index 7bf145c..9afab58 100644
--- a/README.rst
+++ b/README.rst
@@ -86,20 +86,20 @@ Neophyte
       nz = np.nonzero([1,2,0,0,4,0])
 
 
-8. Declare a 3x3 identity matrix
+8. Create a 3x3 identity matrix
 
    .. code:: python
 
       Z = np.eye(3)
 
-9. Declare a 5x5 matrix with values 1,2,3,4 just below the diagonal
+9. Create a 5x5 matrix with values 1,2,3,4 just below the diagonal
 
    .. code:: python
 
       Z = np.diag(1+np.arange(4),k=-1)
 
 
-10. Declare a 10x10x10 array with random values
+10. Create a 10x10x10 array with random values
 
     .. code:: python
 
@@ -108,7 +108,7 @@ Neophyte
 Novice
 ======
 
-1. Declare a 8x8 matrix and fill it with a checkerboard pattern
+1. Create a 8x8 matrix and fill it with a checkerboard pattern
 
    .. code:: python
 
@@ -116,7 +116,7 @@ Novice
       Z[1::2,::2] = 1
       Z[::2,1::2] = 1
 
-2. Declare a 10x10 array with random values and find the minimum and maximum values
+2. Create a 10x10 array with random values and find the minimum and maximum values
 
    .. code:: python
 
@@ -213,7 +213,7 @@ Apprentice
     Z[Z.argmax()] = 0
 
 
-4. Declare a structured array with ``x`` and ``y`` coordinates covering the
+4. Create a structured array with ``x`` and ``y`` coordinates covering the
    [0,1]x[0,1] area.
 
    .. code:: python
@@ -520,6 +520,8 @@ Expert
 
    .. code:: python
 
+      # Chris Barker
+
       Z = np.random.randint(0,5,(10,10))
       n = 3
       i = 1 + (Z.shape[0]-3)