Website build

Author: dham

0_preface.html

@@ -236,7 +236,7 @@ <h2>Changes in the second and third editions<a class="headerlink" href="#changes
 workspaces in <a class="reference internal" href="2_programs_in_files.html#workspaces"><span class="std std-numref">Section 2.2.1</span></a>, and the Flake8 extension in
 <a class="reference internal" href="4_style.html#flake8-extension"><span class="std std-numref">Section 4.2.2</span></a>. Together, these provide correctly integrated code
 linting. It also consistently uses <code class="xref py py-obj docutils literal notranslate"><span class="pre">python</span> <span class="pre">-m</span></code> to invoke tools such as <code class="xref py py-obj docutils literal notranslate"><span class="pre">pip</span></code>,
-<a class="reference external" href="https://docs.pytest.org/en/latest/index.html#module-pytest" title="(in pytest v8.5.0.dev188)"><code class="xref py py-obj docutils literal notranslate"><span class="pre">pytest</span></code></a> and <code class="xref py py-obj docutils literal notranslate"><span class="pre">flake8</span></code>. This is less error-prone for students. The description
+<a class="reference external" href="https://docs.pytest.org/en/latest/index.html#module-pytest" title="(in pytest v8.5.0.dev210)"><code class="xref py py-obj docutils literal notranslate"><span class="pre">pytest</span></code></a> and <code class="xref py py-obj docutils literal notranslate"><span class="pre">flake8</span></code>. This is less error-prone for students. The description
 of <a class="reference external" href="https://docs.python.org/3/reference/compound_stmts.html#finally" title="(in Python v3.14)"><code class="xref std std-keyword docutils literal notranslate"><span class="pre">finally</span></code></a> in <a class="reference internal" href="6_exceptions.html#else-finally"><span class="std std-numref">Section 6.5.2</span></a> has been also improved.</p>
 </section>
 </section>

2_programs_in_files.html

@@ -716,7 +716,7 @@ <h2><span class="section-number">2.5. </span>Testing frameworks<a class="headerl
 including tests in your code here.</p>
 <p>There are a number of Python packages which support code testing. The concepts
 are largely similar so rather than get bogged down in the details of multiple
-frameworks, we will introduce <a class="reference external" href="https://docs.pytest.org/en/latest/index.html" title="(in pytest v8.5.0.dev188)"><span class="xref std std-doc">Pytest</span></a>, which is one of the
+frameworks, we will introduce <a class="reference external" href="https://docs.pytest.org/en/latest/index.html" title="(in pytest v8.5.0.dev210)"><span class="xref std std-doc">Pytest</span></a>, which is one of the
 most widely used. Pytest is simply a Python package, so you can install it into
 your current environment using:</p>
 <div class="highlight-console notranslate"><div class="highlight"><pre><span></span><span class="gp gp-VirtualEnv">(PoP_venv)</span> <span class="gp">$ </span>python<span class="w"> </span>-m<span class="w"> </span>pip<span class="w"> </span>install<span class="w"> </span>pytest

9_trees_and_directed_acyclic_graphs.html

@@ -694,10 +694,10 @@ <h3><span class="section-number">9.4.2. </span>Operations on expression trees<a
 code to execute, depending on the type of the first argument <a class="footnote-reference brackets" href="#single" id="id3" role="doc-noteref"><span class="fn-bracket">[</span>3<span class="fn-bracket">]</span></a>.</p>
 <p><a class="reference internal" href="#tree-evaluate"><span class="std std-numref">Listing 9.7</span></a> shows a single dispatch function for a visitor function
 which evaluates a <code class="xref py py-class docutils literal notranslate"><span class="pre">Expression</span></code>. Start with lines 6-24. These define a
-function <a class="reference internal" href="example_code.html#example_code.expression_tools.evaluate" title="example_code.expression_tools.evaluate"><code class="xref py py-func docutils literal notranslate"><span class="pre">evaluate()</span></code></a> which will be used in
+function <code class="xref py py-func docutils literal notranslate"><span class="pre">evaluate()</span></code> which will be used in
 the default case, that is, in the case where the <a class="reference external" href="https://docs.python.org/3/library/functions.html#type" title="(in Python v3.14)"><code class="xref py py-class docutils literal notranslate"><span class="pre">type</span></code></a> of the first
 argument doesn’t match any of the other implementations of
-<a class="reference internal" href="example_code.html#example_code.expression_tools.evaluate" title="example_code.expression_tools.evaluate"><code class="xref py py-func docutils literal notranslate"><span class="pre">evaluate()</span></code></a>. In this case, the first
+<code class="xref py py-func docutils literal notranslate"><span class="pre">evaluate()</span></code>. In this case, the first
 argument is the expression that we’re evaluating, so if the type doesn’t match
 then this means that we don’t know how to evaluate this object, and the only
 course of action available is to throw an <a class="reference internal" href="6_exceptions.html#term-exception"><span class="xref std std-term">exception</span></a>.</p>
@@ -783,13 +783,13 @@ <h3><span class="section-number">9.4.2. </span>Operations on expression trees<a
 Notice that the function name is given as <code class="xref py py-obj docutils literal notranslate"><span class="pre">_</span></code>. This is the Python convention for
 a name which will never be used. This function will never be called by its
 declared name. Instead, look at the decorator on line 28. The single dispatch
-function <a class="reference internal" href="example_code.html#example_code.expression_tools.evaluate" title="example_code.expression_tools.evaluate"><code class="xref py py-func docutils literal notranslate"><span class="pre">evaluate()</span></code></a> has a <a class="reference internal" href="3_objects.html#term-method"><span class="xref std std-term">method</span></a>
+function <code class="xref py py-func docutils literal notranslate"><span class="pre">evaluate()</span></code> has a <a class="reference internal" href="3_objects.html#term-method"><span class="xref std std-term">method</span></a>
 <code class="xref py py-meth docutils literal notranslate"><span class="pre">register()</span></code>. When used as a decorator, the <code class="xref py py-meth docutils literal notranslate"><span class="pre">register()</span></code> method of a
 single dispatch function registers the function that follows as implementation
 for the <a class="reference external" href="https://docs.python.org/3/reference/compound_stmts.html#class" title="(in Python v3.14)"><code class="xref std std-keyword docutils literal notranslate"><span class="pre">class</span></code></a> given as an argument to <code class="xref py py-meth docutils literal notranslate"><span class="pre">register()</span></code>. On this
 occasion, this is <code class="xref py py-class docutils literal notranslate"><span class="pre">expressions.Number</span></code>.</p>
 <p>Now look at lines 33-35. These contain the implementation of
-<a class="reference internal" href="example_code.html#example_code.expression_tools.evaluate" title="example_code.expression_tools.evaluate"><code class="xref py py-func docutils literal notranslate"><span class="pre">evaluate()</span></code></a> for <code class="xref py py-class docutils literal notranslate"><span class="pre">expressions.Symbol</span></code>.
+<code class="xref py py-func docutils literal notranslate"><span class="pre">evaluate()</span></code> for <code class="xref py py-class docutils literal notranslate"><span class="pre">expressions.Symbol</span></code>.
 In order to evaluate a symbol, we depend on the mapping from symbol names to
 numerical values that has been passed in.</p>
 <p>Finally, look at lines 38-40. These define the evaluation visitor for addition.
@@ -1125,7 +1125,7 @@ <h2><span class="section-number">9.9. </span>Exercises<a class="headerlink" href
 <p>Write a <a class="reference internal" href="#term-single-dispatch-function"><span class="xref std std-term">single dispatch function</span></a> importable as
 <code class="xref py py-func docutils literal notranslate"><span class="pre">expressions.differentiate()</span></code> which has the correct interface to be
 passed to <code class="xref py py-func docutils literal notranslate"><span class="pre">expressions.postvisitor()</span></code> or
-<a class="reference internal" href="example_code.html#example_code.expression_tools.postvisitor" title="example_code.expression_tools.postvisitor"><code class="xref py py-func docutils literal notranslate"><span class="pre">example_code.expression_tools.postvisitor()</span></code></a> and which differentiates the
+<code class="xref py py-func docutils literal notranslate"><span class="pre">example_code.expression_tools.postvisitor()</span></code> and which differentiates the
 expression provided with respect to a symbol whose name is passed as the
 string <a class="reference external" href="https://docs.python.org/3/glossary.html#term-argument" title="(in Python v3.14)"><span class="xref std std-term">keyword argument</span></a> <code class="xref py py-obj docutils literal notranslate"><span class="pre">var</span></code>.</p>
 <p>As a simplification, the tests will assume that <code class="xref py py-obj docutils literal notranslate"><span class="pre">var</span></code> does not appear in an

_modules/index.html

@@ -59,7 +59,6 @@
   <h1>All modules for which code is available</h1>
 <ul><li><a href="example_code/addable.html">example_code.addable</a></li>
 <li><a href="example_code/euclid.html">example_code.euclid</a></li>
-<li><a href="example_code/expression_tools.html">example_code.expression_tools</a></li>
 <li><a href="example_code/graphs.html">example_code.graphs</a></li>
 <li><a href="example_code/groups.html">example_code.groups</a></li>
 <li><a href="example_code/groups_abc.html">example_code.groups_abc</a></li>

_sources/exercises.rst.txt

@@ -13,8 +13,7 @@ If you are using this book as a part of a course where the instructor provides
 GitHub Classroom assignments for the exercises, you should not use the links
 here but rather use the Classroom links provided by your instructor. Students
 taking Principles of Programming at Imperial College London will find their
-list of GitHub Classroom links `on Blackboard
-<https://bb.imperial.ac.uk/ultra/courses/_37896_1/cl/outline>`__.
+list of GitHub Classroom links on Blackboard.
 
 
 * `Chapter 2 exercises <https://github.com/object-oriented-python/exercises-chapter-2>`__

_sources/tests_and_exams.rst.txt

@@ -21,13 +21,10 @@ Python documentation for any features they suggest.
 Test format
 -----------
 
-The final exam will be two hours long and comprise 4 questions, each of which
-will be marked out of 20. The midterm test will be 40 minutes long, so to keep
-the question format consistent with the final exam, there will a single
-question. The extra 10 minutes is to give you some flexibility, because in the
-final exam you could spend more time on some questions than others. The
-question will be subdivided into identified parts with a specified number of
-marks associated with each.
+The final exam will be two hours long and comprise 3 questions, each of which
+will be marked out of 20. The midterm test will be 40 minutes long and there
+will a single question. The question will be subdivided into identified parts
+with a specified number of marks associated with each.
 
 .. The test will work using GitHub Classroom. The link to accept the test
 .. "assignment" will be distributed at the start time of the test, simultaneously
@@ -48,53 +45,53 @@ of flake8 and disregard any false positives. The other 2 marks will be allocated
 on a similar basis for basic style matters that flake8 cannot check, such as
 conforming with naming conventions and commenting appropriately.
 
-The remaining 16 marks will be allocated to the various parts of the questions. As with a
-written maths test, getting the correct final answer is necessary but not
-sufficient. A full marks answer to a question will be functionally correct, have
-optimal :term:`algorithmic complexity`, and be elegant and readable. The tests
-provided are an aid to writing correct code: passing the tests does not prove
-that your answer is correct. For example, your code could produce the correct
-output in the cases tested but nonetheless fail to implement the specification in
-the question. For the avoidance of doubt, a correct answer is one which
-correctly implements the specification, not simply one which passes the tests
-provided. 
+The remaining 16 marks will be allocated to the various parts of the questions.
+As with a written maths test, getting the correct final answer is necessary but
+not sufficient. A full marks answer to a question will be functionally correct,
+have optimal :term:`algorithmic complexity`, and be elegant and readable. The
+tests provided are an aid to writing correct code: passing the tests does not
+prove that your answer is correct. For example, your code could produce the
+correct output in the cases tested but nonetheless fail to implement the
+specification in the question. For the avoidance of doubt, a correct answer is
+one which correctly implements the specification, not simply one which passes
+the tests provided. 
 
 As a rough guide, a solution which produced the correct output but was very
 inelegantly written (for example taking many too many steps to achieve simple
 functionality) and which used a suboptimal algorithm could be expected to earn
 half of the marks available for a question.
 
-.. Using Git in the test
-.. ---------------------
-
-.. You should accept the test from GitHub Classroom, and clone the test repository
-.. into the folder you created for the course, just like you have been doing for
-.. the exercise repositories. This will help ensure that you are programming in
-.. the same environment you have been using all along, and therefore avoid any
-.. unfortunate misconfiguration surprises in the test.
-
-.. This is a test of programming as a whole, so using Git correctly is a part of
-.. the test. This has some consequences for how you should go about the test:
-
-.. 1. Commit *and* push your work as you go along. Do not rely on committing once
-..    at the end of the test. You will be marked on what you have pushed to GitHub
-..    at the end of the test period. If the first time that you try to push
-..    something to GitHub is at the end of the test time, and something goes wrong, then
-..    you will receive 0% for the test, because you will not have pushed any
-..    answers.
-.. 2. Don't forget to `git add` any files you need to create. If you don't add them
-..    to the repository, they won't be pushed and therefore they won't be marked.
-
-.. .. warning::
-
-..     If you commit and push often as you go through the test then not only will
-..     you know that you have some marks in the bank already, but you will have a
-..     record of what you had done at each point in time. In the unlikely event of a failure outside your
-..     control, such as your network failing or GitHub going down, it will be very
-..     easy to assign the correct marks to students who have already pushed a large
-..     part of their work to GitHub. At the other extreme, it will be difficult to
-..     ascribe any credit at all to students with no pushed work who then push a
-..     single commit to GitHub after the time has expired.
+Using Git in the test
+---------------------
+
+You should accept the test from GitHub Classroom, and clone the test repository
+into the folder you created for the course, just like you have been doing for
+the exercise repositories. This will help ensure that you are programming in
+the same environment you have been using all along, and therefore avoid any
+unfortunate misconfiguration surprises in the test.
+
+This is a test of programming as a whole, so using Git correctly is a part of
+the test. This has some consequences for how you should go about the test:
+
+1. Commit *and* push your work as you go along. Do not rely on committing once
+   at the end of the test. You will be marked on what you have pushed to GitHub
+   at the end of the test period. If the first time that you try to push
+   something to GitHub is at the end of the test time, and something goes wrong, then
+   you will receive 0% for the test, because you will not have pushed any
+   answers.
+2. Don't forget to `git add` any files you need to create. If you don't add them
+   to the repository, they won't be pushed and therefore they won't be marked.
+
+.. warning::
+
+    If you commit and push often as you go through the test then not only will
+    you know that you have some marks in the bank already, but you will have a
+    record of what you had done at each point in time. In the unlikely event of a failure outside your
+    control, such as your network failing or GitHub going down, it will be very
+    easy to assign the correct marks to students who have already pushed a large
+    part of their work to GitHub. At the other extreme, it will be difficult to
+    ascribe any credit at all to students with no pushed work who then push a
+    single commit to GitHub after the time has expired.
 
 Preparing for the test
 ----------------------
@@ -121,7 +118,7 @@ Exercises
 .. proof:exercise::
 
     Obtain the `practice problem from GitHub Classroom
-    <https://classroom.github.com/a/whZ5Hmzx>`__. Follow the instructions in
+    <https://classroom.github.com/a/N9g4rTii>`__. Follow the instructions in
     the README file that will be displayed on GitHub on your copy of the page.
 
     Note that these instructions are only applicable to the practice problems.
@@ -130,7 +127,7 @@ Exercises
 .. proof:exercise::
 
     Obtain the `practice problem from GitHub Classroom
-    <https://classroom.github.com/a/BIoMj_-E>`__. Follow the instructions in
+    <https://classroom.github.com/a/inNEPHVo>`__. Follow the instructions in
     the README file that will be displayed on GitHub on your copy of the page.
 
     Note that these instructions are only applicable to the practice problems.
@@ -139,7 +136,7 @@ Exercises
 .. proof:exercise::
 
     Obtain the `practice problem from GitHub Classroom
-    <https://classroom.github.com/a/jVHNwYHx>`__. Follow the instructions in
+    <https://classroom.github.com/a/OIuwA4kx>`__. Follow the instructions in
     the README file that will be displayed on GitHub on your copy of the page.
 
     Note that these instructions are only applicable to the practice problems.
@@ -148,7 +145,7 @@ Exercises
 .. proof:exercise::
 
     Obtain the `practice problem from GitHub Classroom
-    <https://classroom.github.com/a/6bPHF9F7>`__. Follow the instructions in
+    <https://classroom.github.com/a/xiJiYtY5>`__. Follow the instructions in
     the README file that will be displayed on GitHub on your copy of the page.
 
     Note that these instructions are only applicable to the practice problems.