Skip to content

Commit 167a285

Browse files
committed
Website build
1 parent fe58949 commit 167a285

7 files changed

Lines changed: 21 additions & 8 deletions

File tree

-19 Bytes
Binary file not shown.

L2_QR_factorisation.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ <h2><span class="section-number">2.2. </span>QR factorisation by classical Gram-
155155
<p>with <span class="math notranslate nohighlight">\((q_1,q_2,\ldots,q_n)\)</span> an orthonormal set. The non-diagonal
156156
entries of <span class="math notranslate nohighlight">\(R\)</span> are found by inner products, i.e.,</p>
157157
<div class="math notranslate nohighlight">
158-
\[r_{ij} = q_i^*a_j, \, i &gt; j,\]</div>
158+
\[r_{ij} = q_i^*a_j, \, i &lt; j,\]</div>
159159
<p>and the diagonal entries are chosen so that <span class="math notranslate nohighlight">\(\|q_i\|=1\)</span>, for
160160
<span class="math notranslate nohighlight">\(i=1,2,\ldots,n\)</span>, i.e.</p>
161161
<div class="math notranslate nohighlight">
@@ -347,7 +347,7 @@ <h2><span class="section-number">2.5. </span>Modified Gram-Schmidt as triangular
347347
\underbrace{
348348
\begin{pmatrix}
349349
\frac{1}{r_{11}} &amp; -\frac{r_{12}}{r_{11}} &amp; \ldots &amp;
350-
\ldots &amp; -\frac{r_{11}}{r_{11}} \\
350+
\ldots &amp; -\frac{r_{1n}}{r_{11}} \\
351351
0 &amp; 1 &amp; 0 &amp; \ldots &amp; 0 \\
352352
0 &amp; 0 &amp; 1 &amp; \ldots &amp; 0 \\
353353
\vdots &amp; \ddots &amp; \ddots &amp; \ldots &amp; \vdots \\
@@ -681,7 +681,7 @@ <h2><span class="section-number">2.6. </span>Householder triangulation<a class="
681681
done so, you will need to modified
682682
<a class="reference internal" href="cla_utils.html#cla_utils.exercises3.householder" title="cla_utils.exercises3.householder"><code class="xref py py-func docutils literal notranslate"><span class="pre">cla_utils.exercises3.householder()</span></code></a> to use the <code class="docutils literal notranslate"><span class="pre">kmax</span></code>
683683
argument. You may make use of the built-in triangular solve
684-
algorithm <a class="reference external" href="http://scipy.github.io/devdocs/reference/generated/scipy.linalg.solve_triangular.html#scipy.linalg.solve_triangular" title="(in SciPy v1.8.0.dev0+1849.a542b67)"><code class="xref py py-func docutils literal notranslate"><span class="pre">scipy.linalg.solve_triangular()</span></code></a> (we shall consider
684+
algorithm <a class="reference external" href="http://scipy.github.io/devdocs/reference/generated/scipy.linalg.solve_triangular.html#scipy.linalg.solve_triangular" title="(in SciPy v1.8.0.dev0+1869.838cfbe)"><code class="xref py py-func docutils literal notranslate"><span class="pre">scipy.linalg.solve_triangular()</span></code></a> (we shall consider
685685
triangular matrix algorithms briefly later). The test script
686686
<code class="docutils literal notranslate"><span class="pre">test_exercises3.py</span></code> in the <code class="docutils literal notranslate"><span class="pre">test</span></code> directory will also test this
687687
function.</p>
@@ -793,7 +793,7 @@ <h2><span class="section-number">2.7. </span>Application: Least squares problems
793793
appropriate augmented matrix <span class="math notranslate nohighlight">\(\hat{A}\)</span>, calling
794794
<a class="reference internal" href="cla_utils.html#cla_utils.exercises3.householder" title="cla_utils.exercises3.householder"><code class="xref py py-func docutils literal notranslate"><span class="pre">cla_utils.exercises3.householder()</span></code></a> and extracting appropriate
795795
subarrays using slice notation, before using
796-
<a class="reference external" href="http://scipy.github.io/devdocs/reference/generated/scipy.linalg.solve_triangular.html#scipy.linalg.solve_triangular" title="(in SciPy v1.8.0.dev0+1849.a542b67)"><code class="xref py py-func docutils literal notranslate"><span class="pre">scipy.linalg.solve_triangular()</span></code></a> to solve the resulting upper triangular
796+
<a class="reference external" href="http://scipy.github.io/devdocs/reference/generated/scipy.linalg.solve_triangular.html#scipy.linalg.solve_triangular" title="(in SciPy v1.8.0.dev0+1869.838cfbe)"><code class="xref py py-func docutils literal notranslate"><span class="pre">scipy.linalg.solve_triangular()</span></code></a> to solve the resulting upper triangular
797797
system, before returning the solution <span class="math notranslate nohighlight">\(x\)</span>. The test script
798798
<code class="docutils literal notranslate"><span class="pre">test_exercises3.py</span></code> in the <code class="docutils literal notranslate"><span class="pre">test</span></code> directory will also test this
799799
function.</p>

_modules/cla_utils/exercises2.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ <h1>Source code for cla_utils.exercises2</h1><div class="highlight"><pre>
129129

130130
<span class="k">raise</span> <span class="ne">NotImplementedError</span>
131131

132-
<span class="k">return</span> <span class="n">Q</span><span class="p">,</span> <span class="n">R</span></div>
132+
<span class="k">return</span> <span class="n">R</span></div>
133133

134134
<div class="viewcode-block" id="GS_modified"><a class="viewcode-back" href="../../cla_utils.html#cla_utils.exercises2.GS_modified">[docs]</a><span class="k">def</span> <span class="nf">GS_modified</span><span class="p">(</span><span class="n">A</span><span class="p">):</span>
135135
<span class="sd">&quot;&quot;&quot;</span>

_sources/L2_QR_factorisation.rst.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ entries of `R` are found by inner products, i.e.,
125125

126126
.. math::
127127
128-
r_{ij} = q_i^*a_j, \, i > j,
128+
r_{ij} = q_i^*a_j, \, i < j,
129129
130130
and the diagonal entries are chosen so that `\|q_i\|=1`, for
131131
`i=1,2,\ldots,n`, i.e.
@@ -350,7 +350,7 @@ example, at the first iteration,
350350
\underbrace{
351351
\begin{pmatrix}
352352
\frac{1}{r_{11}} & -\frac{r_{12}}{r_{11}} & \ldots &
353-
\ldots & -\frac{r_{11}}{r_{11}} \\
353+
\ldots & -\frac{r_{1n}}{r_{11}} \\
354354
0 & 1 & 0 & \ldots & 0 \\
355355
0 & 0 & 1 & \ldots & 0 \\
356356
\vdots & \ddots & \ddots & \ldots & \vdots \\

_sources/errata.rst.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,11 @@ repositories for Autumn 2021. An up to date version is in the
1212
correct indices. Now reads: "Return the rank2 matrix A = u_1v_1^* +
1313
u_2*v_2^*." See the code on the course website for the up-to-date
1414
version.
15+
16+
2. The skeleton code for exercises2.GS_classical was amended as the
17+
function should just return R, not Q and R.
18+
19+
3. Updated the sign of the inequality in the formula for $r$ in Section 2.2.
20+
21+
4. Replaced $r_{11}/r_{11}$ by $r_{1n}/r_{11}$ in the final column of the
22+
right-multiplied $R$ matrix in Section 2.5.

errata.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ <h1>Errata for 2021/22<a class="headerlink" href="#errata-for-2021-22" title="Pe
5757
correct indices. Now reads: “Return the rank2 matrix A = u_1v_1^* +
5858
u_2*v_2^*.” See the code on the course website for the up-to-date
5959
version.</p></li>
60+
<li><p>The skeleton code for exercises2.GS_classical was amended as the
61+
function should just return R, not Q and R.</p></li>
62+
<li><p>Updated the sign of the inequality in the formula for $r$ in Section 2.2.</p></li>
63+
<li><p>Replaced $r_{11}/r_{11}$ by $r_{1n}/r_{11}$ in the final column of the
64+
right-multiplied $R$ matrix in Section 2.5.</p></li>
6065
</ol>
6166
</section>
6267

searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)