Skip to content

Commit

Permalink
Tweak Stencil chapter to use Table when specifying step sizes
Browse files Browse the repository at this point in the history
  • Loading branch information
xpqz committed Aug 13, 2021
1 parent b35e668 commit 34e09c9
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 60 deletions.
Binary file modified contents/_build/.doctrees/environment.pickle
Binary file not shown.
Binary file modified contents/_build/.doctrees/stencil.doctree
Binary file not shown.
Binary file modified contents/_build/.jupyter_cache/global.db
Binary file not shown.
48 changes: 24 additions & 24 deletions contents/_build/html/_sources/stencil.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": 6,
"metadata": {
"tags": [
"hide-output"
Expand All @@ -44,7 +44,7 @@
"</span>"
]
},
"execution_count": 1,
"execution_count": 6,
"metadata": {},
"output_type": "execute_result"
},
Expand All @@ -55,7 +55,7 @@
"</span>"
]
},
"execution_count": 1,
"execution_count": 6,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -77,11 +77,11 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 7,
"metadata": {},
"outputs": [],
"source": [
"gol{≢⍸⍵}⌺3 3∊¨3+0,¨⊢ ⍝ Generate the next generation"
"gol{≢⍸⍵}⌺3 3∊¨3+0,¨⊢ ⍝ Generate the next generation"
]
},
{
Expand All @@ -93,7 +93,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 8,
"metadata": {},
"outputs": [
{
Expand All @@ -110,15 +110,15 @@
"</span>"
]
},
"execution_count": 9,
"execution_count": 8,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"glider ← 3 3⍴0 0 1 1 0 1 0 1 1\n",
"dish ← 8 8⍴0\n",
"dish[(⊂3 3)+⍸glider]1\n",
"dish[(⊂3 3)+⍸glider]1\n",
"dish"
]
},
Expand All @@ -131,7 +131,7 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 9,
"metadata": {},
"outputs": [
{
Expand All @@ -150,7 +150,7 @@
"</span>"
]
},
"execution_count": 10,
"execution_count": 9,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -172,7 +172,7 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": 10,
"metadata": {},
"outputs": [
{
Expand All @@ -182,7 +182,7 @@
"</span>"
]
},
"execution_count": 11,
"execution_count": 10,
"metadata": {},
"output_type": "execute_result"
}
Expand Down Expand Up @@ -262,25 +262,25 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": 11,
"metadata": {},
"outputs": [
{
"data": {
"text/html": [
"<span style=\"white-space:pre; font-family: monospace\">┌─────┬─────┬─────┬─────\n",
"│0 1 2│3 4 5│6 7 8│9 10 0│\n",
"└─────┴─────┴─────┴─────\n",
"<span style=\"white-space:pre; font-family: monospace\">┌─────┬─────┬─────┬─────┐\n",
"│0 0 1│2 3 4│5 6 7│8 9 0│\n",
"└─────┴─────┴─────┴─────┘\n",
"</span>"
]
},
"execution_count": 1,
"execution_count": 11,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"⊂⍤⊢⌺(2 1⍴3 3)⊢⍳10"
"⊂⍤⊢⌺(3 3)⊢⍳10"
]
},
{
Expand All @@ -294,25 +294,25 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 12,
"metadata": {},
"outputs": [
{
"data": {
"text/html": [
"<span style=\"white-space:pre; font-family: monospace\">┌───┬───┬───┬───┬───\n",
"1 2│3 4│5 6│7 8│9 10\n",
"└───┴───┴───┴───┴───\n",
"<span style=\"white-space:pre; font-family: monospace\">┌───┬───┬───┬───┬───┐\n",
"0 1│2 3│4 5│6 7│8 9\n",
"└───┴───┴───┴───┴───┘\n",
"</span>"
]
},
"execution_count": 2,
"execution_count": 12,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"⊂⍤⊢⌺(2 1⍴2 2)⊢⍳10"
"⊂⍤⊢⌺(2 2)⊢⍳10"
]
},
{
Expand Down
8 changes: 4 additions & 4 deletions contents/_build/html/stencil.html
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ <h1>The Stencil operator: <code class="docutils literal notranslate"><span class
<p>Here’s the current champion, all 17 symbols of it:</p>
<div class="cell docutils container">
<div class="cell_input docutils container">
<div class="highlight-APL notranslate"><div class="highlight"><pre><span></span><span class="nv">gol</span><span class="kd"></span><span class="kt">{</span><span class="o">≢⍸</span><span class="bp"></span><span class="kt">}</span><span class="na"></span><span class="m">3</span> <span class="m">3</span><span class="o"></span><span class="na">¨</span><span class="m">3</span><span class="o">+</span><span class="m">0</span><span class="o">,</span><span class="na">¨</span><span class="o"></span> <span class="c1">⍝ Generate the next generation</span>
<div class="highlight-APL notranslate"><div class="highlight"><pre><span></span><span class="nv">gol</span> <span class="kd"></span> <span class="kt">{</span><span class="o">≢⍸</span><span class="bp"></span><span class="kt">}</span><span class="na"></span><span class="m">3</span> <span class="m">3</span><span class="o"></span><span class="na">¨</span><span class="m">3</span><span class="o">+</span><span class="m">0</span><span class="o">,</span><span class="na">¨</span><span class="o"></span> <span class="c1">⍝ Generate the next generation</span>
</pre></div>
</div>
</div>
Expand All @@ -406,7 +406,7 @@ <h1>The Stencil operator: <code class="docutils literal notranslate"><span class
<div class="cell_input docutils container">
<div class="highlight-APL notranslate"><div class="highlight"><pre><span></span><span class="nv">glider</span> <span class="kd"></span> <span class="m">3</span> <span class="m">3</span><span class="o"></span><span class="m">0</span> <span class="m">0</span> <span class="m">1</span> <span class="m">1</span> <span class="m">0</span> <span class="m">1</span> <span class="m">0</span> <span class="m">1</span> <span class="m">1</span>
<span class="nv">dish</span> <span class="kd"></span> <span class="m">8</span> <span class="m">8</span><span class="o"></span><span class="m">0</span>
<span class="nv">dish</span><span class="sr">[</span><span class="p">(</span><span class="o"></span><span class="m">3</span> <span class="m">3</span><span class="p">)</span><span class="o">+⍸</span><span class="nv">glider</span><span class="sr">]</span><span class="kd"></span><span class="m">1</span>
<span class="nv">dish</span><span class="sr">[</span><span class="p">(</span><span class="o"></span><span class="m">3</span> <span class="m">3</span><span class="p">)</span><span class="o">+⍸</span><span class="nv">glider</span><span class="sr">]</span> <span class="kd"></span> <span class="m">1</span>
<span class="nv">dish</span>
</pre></div>
</div>
Expand Down Expand Up @@ -485,7 +485,7 @@ <h1>The Stencil operator: <code class="docutils literal notranslate"><span class
<p><em>Stencil</em> has a few more tricks up its sleeve. The right operand can be an array, where the first row defines the shape of the window, and the second row defines the <em>step size</em>. Again, using the vector above, we can say that we want a size 3 window, but instead of moving it one step (the default), we want to shift it three steps each time:</p>
<div class="cell docutils container">
<div class="cell_input docutils container">
<div class="highlight-APL notranslate"><div class="highlight"><pre><span></span><span class="o"></span><span class="na"></span><span class="o"></span><span class="na"></span><span class="p">(</span><span class="m">2</span> <span class="m">1</span><span class="o"></span><span class="m">3</span> <span class="m">3</span><span class="p">)</span><span class="o">⊢⍳</span><span class="m">10</span>
<div class="highlight-APL notranslate"><div class="highlight"><pre><span></span><span class="o"></span><span class="na"></span><span class="o"></span><span class="na"></span><span class="p">(</span><span class="o"></span><span class="m">3</span> <span class="m">3</span><span class="p">)</span><span class="o">⊢⍳</span><span class="m">10</span>
</pre></div>
</div>
</div>
Expand All @@ -499,7 +499,7 @@ <h1>The Stencil operator: <code class="docutils literal notranslate"><span class
<p>With an even size we can create non-overlapping windows that don’t overhang,</p>
<div class="cell docutils container">
<div class="cell_input docutils container">
<div class="highlight-APL notranslate"><div class="highlight"><pre><span></span><span class="o"></span><span class="na"></span><span class="o"></span><span class="na"></span><span class="p">(</span><span class="m">2</span> <span class="m">1</span><span class="o"></span><span class="m">2</span> <span class="m">2</span><span class="p">)</span><span class="o">⊢⍳</span><span class="m">10</span>
<div class="highlight-APL notranslate"><div class="highlight"><pre><span></span><span class="o"></span><span class="na"></span><span class="o"></span><span class="na"></span><span class="p">(</span><span class="o"></span><span class="m">2</span> <span class="m">2</span><span class="p">)</span><span class="o">⊢⍳</span><span class="m">10</span>
</pre></div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions contents/_build/jupyter_execute/stencil.apl
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
]box on
]rows on

gol{}3 3¨3+0,¨ Generate the next generation
gol {}3 3¨3+0,¨ Generate the next generation

glider 3 30 0 1 1 0 1 0 1 1
dish 8 80
dish[(3 3)+glider]1
dish[(3 3)+glider] 1
dish

1 4(gol1dish)(gol2dish)(gol3dish)(gol4dish)
Expand All @@ -17,9 +17,9 @@ dish

310

(2 13 3)10
(3 3)10

(2 12 2)10
(2 2)10

(4 4)10

Expand Down
8 changes: 4 additions & 4 deletions contents/_build/jupyter_execute/stencil.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"metadata": {},
"outputs": [],
"source": [
"gol{≢⍸⍵}⌺3 3∊¨3+0,¨⊢ ⍝ Generate the next generation"
"gol{≢⍸⍵}⌺3 3∊¨3+0,¨⊢ ⍝ Generate the next generation"
]
},
{
Expand Down Expand Up @@ -118,7 +118,7 @@
"source": [
"glider ← 3 3⍴0 0 1 1 0 1 0 1 1\n",
"dish ← 8 8⍴0\n",
"dish[(⊂3 3)+⍸glider]1\n",
"dish[(⊂3 3)+⍸glider]1\n",
"dish"
]
},
Expand Down Expand Up @@ -280,7 +280,7 @@
}
],
"source": [
"⊂⍤⊢⌺(2 1⍴3 3)⊢⍳10"
"⊂⍤⊢⌺(3 3)⊢⍳10"
]
},
{
Expand Down Expand Up @@ -312,7 +312,7 @@
}
],
"source": [
"⊂⍤⊢⌺(2 1⍴2 2)⊢⍳10"
"⊂⍤⊢⌺(2 2)⊢⍳10"
]
},
{
Expand Down
Loading

0 comments on commit 34e09c9

Please sign in to comment.