Proofed book.

Author: dham

doc/source/0_preface.rst

@@ -22,10 +22,10 @@ The assumptions underpinning this approach seem to be some combination of a
 belief that maths degrees should only teach maths, as well a feeling that the
 mathematical algorithms are some how the difficult part and that programming is
 a mere technical skill that students will somehow pick up along the way. The
-regrettable consequence of this approach is that many maths students and
-graduates end up without the programming, software development, and debugging
-skills that they need to make effective use of computers in their further
-studies or working careers.
+consequence of this approach is that many maths students and graduates end up
+without the programming, software development, and debugging skills that they
+need to make effective use of computers in their further studies or working
+careers.
 
 What is this book for?
 ----------------------

doc/source/2_programs_in_files.rst

@@ -424,6 +424,12 @@ packages come in. A Python package is a collection of module files,
 which can be imported together. The basic folder structure of a Python
 package is shown in :numref:`package-layout`.
 
+.. only:: book
+    
+    .. raw:: latex
+
+        \clearpage
+
 .. _package-layout:
 
 .. code-block::
@@ -649,15 +655,13 @@ There is one more feature of Pip packages that it is useful to introduce at
 this stage: dependencies. If you write a package and the modules in that
 package themselves import other packages, then a user will need those packages
 to be installed in their Python environment, or your package will not work. If
-those packages form part of the Python :ref:`Standard Library <library-index>`
-then you need do nothing at all since they will automatically be available.
-However, if your package depends on other packages that need to be installed
-from PyPI then steps need to be taken to ensure that your users will have the
-correct packages installed. The `install_requires` keyword argument to
-:func:`setuptools.setup` takes a list of Pip package names. Pip will install
-any of these packages that are not already available before installing the
-package itself. :numref:`dependency-setup-py` illustrates this by adding a
-dependency on :mod:`numpy`.
+your package depends on other packages that need to be installed from PyPI then
+steps need to be taken to ensure that your users will have the correct packages
+installed. The `install_requires` keyword argument to :func:`setuptools.setup`
+takes a list of Pip package names. Pip will install any of these packages that
+are not already available before installing the package itself.
+:numref:`dependency-setup-py` illustrates this by adding a dependency on
+:mod:`numpy`.
 
 .. _dependency-setup-py:
 
@@ -675,11 +679,15 @@ dependency on :mod:`numpy`.
 
 .. warning::
 
-    `install_requires` should only list packages that Pip can install from
-    PyPI. In particular, packages from the built-in Python Standard Library
-    must not be listed in `install_requires`. Listing these packages is
-    unnecessary, since they are guaranteed to be available, and will cause an
-    error because Pip will attempt (and fail) to install them from PyPI.
+    `install_requires` should not list packages from the Python Standard
+    Library. These are always available, and listing them will cause Pip to error.
+    
+
+..     `install_requires` should only list packages that Pip can install from
+..     PyPI. In particular, packages from the built-in Python Standard Library
+..     must not be listed in `install_requires`. Listing these packages is
+..     unnecessary, since they are guaranteed to be available, and will cause an
+..     error because Pip will attempt (and fail) to install them from PyPI.
 
 Testing frameworks
 ------------------
@@ -947,11 +955,6 @@ already familiar with Git and GitHub then you will also need to work through
 ..     you will use for this course on your computer. Start with an overall folder
 ..     for the module, and create a virtual environment in that module.
 
-.. only:: book
-
-    .. raw:: latex
-
-        \clearpage
 
 .. _course_repo:
 
@@ -1030,8 +1033,13 @@ already familiar with Git and GitHub then you will also need to work through
         After this and every exercise in which you write code, ensure that you
         add any new files to Git, commit all of your changes, and push to
         GitHub. Then ensure that the tests pass on GitHub. For more information
-        about how to do any of these, refer back the :ref:`Faculty of Natural Sciences
-        Git instructions <github_classroom_exercise>`.
+        about how to do any of these, refer to :numref:`Appendix %s <git>`.
+
+.. only:: book
+
+    .. raw:: latex
+
+        \clearpage
 
 .. proof:exercise::
 

doc/source/4_style.rst

@@ -143,7 +143,7 @@ activated your :term:`virtual environment` and then run:
 
 .. code-block:: console
 
-    (my_venv) $ python -m pip install flake8
+    (PoP_venv) $ python -m pip install flake8
 
 This is enough to run Flake8 on the command line, however you will probably want
 to set up your editor to highlight flake8 incompatibilities in your source. For
@@ -299,14 +299,14 @@ White space within lines
 
         .. code-block:: python3
 
-            my_function (1) # Space between function name and bracket.
+            sin (1) # Space between function name and bracket.
             x [0] # Space before index square bracket.
 
     .. container:: goodcode
 
         .. code-block:: python3
 
-            my_function(1)
+            sin(1)
             x[0]
  
 3. Put a space after a comma but not before it, exactly like you would
@@ -537,14 +537,14 @@ function, variable, and module names
 
         .. code-block:: python3
 
-            def Euler  # Don't capitalise function names.
+            def Euler(n): # Don't capitalise function names.
             MaxRadius = 10.  # No CamelCase.
 
     .. container:: goodcode
 
         .. code-block:: python3
         
-            def euler  # Lower case, even for names.
+            def euler(n):  # Lower case, even for names.
             max_radius = 10.  # Separate words with _.
 
 method parameters
@@ -1036,7 +1036,8 @@ a full stop.
     .. code-block:: python3
 
         def fib(n):
-            "Return the n-th Fibonacci number"  # Single quotes, no full stop.
+            "Return the n-th Fibonacci number"  # Single quotes,
+                                                # no full stop.
 
         def fib(n):
             """Returns the n-th Fibonacci number."""  # Sentence not 
@@ -1336,6 +1337,11 @@ neverending sequence of gliders:
 
         Gliders rotated by 1, 2, and 3 right angles anticlockwise.
 
+.. only:: book
+
+    .. raw:: latex
+
+        \clearpage
 
 .. proof:exercise::
 

doc/source/6_exceptions.rst

@@ -107,6 +107,12 @@ occurs. Consider the following code:
     a = (1, 2
     print(a)
 
+.. only:: book
+
+    .. raw:: latex
+
+        \clearpage
+
 The error here is a missing closing bracket on the first line, however
 the error message which the :term:`Python interpreter` prints when this code is run is:
 

doc/source/7_inheritance.rst

@@ -59,6 +59,12 @@ a :term:`class`, :func:`issubclass` will tell us when one
    In [5]: issubclass(int, Number)
    Out[5]: True
 
+.. only:: book
+
+    .. raw:: latex
+
+        \clearpage
+
 In fact, there is a whole hierarchy of
 numeric types in :mod:`numbers`:
 
@@ -322,7 +328,7 @@ follows:
     :linenos:
 
     class GeneralLinearGroup:
-        """The general linear group represented by degree x degree matrices."""
+        """The general linear group represented by degree square matrices."""
         def __init__(self, degree):
             self.degree = degree
 
@@ -351,7 +357,7 @@ follows:
 
         def __repr__(self):
             """Return the canonical string representation of the group."""
-            return f"{type(self).__name__}({repr(self.degree)})"
+            return f"{type(sxelf).__name__}({repr(self.degree)})"
 
 We won't illustrate the operation of this class, though the reader is welcome to
 :keyword:`import` the :mod:`example_code.groups_basic` module and experiment.
@@ -593,6 +599,12 @@ than the current one with:
 Observe that since `type(self)` is a :term:`class`, we can :term:`instantiate`
 it by calling it.
 
+.. only:: book
+
+    .. raw:: latex
+
+        \clearpage
+
 Calling parent class methods
 ----------------------------
 

doc/source/8_debugging.rst

@@ -46,8 +46,14 @@ illustrated with an example.
     Richard,Mccoy,RM518
     Marjorie,Jackson,MJ1418
 
+.. only:: book
+
+    .. raw:: latex
+
+        \clearpage
+
 :numref:`student_data` shows the first few records in a table of student data.
-Having installed pandas:
+Having installed Pandas:
 
 .. code-block:: console
 
@@ -80,11 +86,23 @@ the following code enables us to access the data from within Python:
     In [6]: type(students['FirstName'])
     Out[6]: pandas.core.series.Series
 
-Observe that the :class:`~pandas.DataFrame` acts as a dictionary of
-one-dimensional data :class:`~pandas.Series`. A :class:`pandas.Series` can be
-indexed and sliced like any other Python :ref:`sequence type <typesseq>`. This
-very high level introduction is all we'll need to use pandas in demonstrations
-in this chapter. Much more documentation is available on the `pandas website <https://pandas.pydata.org/docs/>`__.
+.. only:: not book
+
+    Observe that the :class:`~pandas.DataFrame` acts as a dictionary of
+    one-dimensional data :class:`~pandas.Series`. A :class:`pandas.Series` can be
+    indexed and sliced like any other Python :ref:`sequence type <typesseq>`. This
+    very high level introduction is all we'll need to use pandas in demonstrations
+    in this chapter. Much more documentation is available on the `Pandas website <https://pandas.pydata.org/docs/>`__.
+
+.. only:: book
+
+    Observe that the :class:`~pandas.DataFrame` acts as a dictionary of
+    one-dimensional data :class:`~pandas.Series`. A :class:`pandas.Series` can be
+    indexed and sliced like any other Python :ref:`sequence type <typesseq>`. This
+    very high level introduction is all we'll need to use pandas in demonstrations
+    in this chapter. Much more documentation is available on the 
+    Pandas website [#pandas]_.
+
 
 .. note::
 
@@ -497,17 +515,17 @@ The recipe for hypothesis-based debugging runs something like the following:
 1. Hypothesis Formation
 
    What statements would be true were this issue not occurring. For example:
-    a. Are there variables which should have a known type or value, or would
-       have a known type or value in response to a different input?
-    b. Does it appear that particular code that should have run already has
-       not, or code that should not run has run?
-    c. Looking at a value which is observed to be wrong, where is the operation
-       that computes that value? Does a. or b. apply to any of the inputs to
-       that operation.
-
-    This process requires intuition and understanding of the problem. It is the
-    least systematic part of the process. The following steps are much more
-    systematic.
+   a. Are there variables which should have a known type or value, or would
+    have a known type or value in response to a different input?
+   b. Does it appear that particular code that should have run already has
+    not, or code that should not run has run?
+   c. Looking at a value which is observed to be wrong, where is the operation
+    that computes that value? Does a. or b. apply to any of the inputs to
+    that operation.
+
+   This process requires intuition and understanding of the problem. It is the
+   least systematic part of the process. The following steps are much more
+   systematic.
 
 2. Hypothesis testing
 
@@ -907,6 +925,9 @@ Exercises
 
 .. rubric:: Footnotes
 
+.. [#pandas] `<https://pandas.pydata.org/docs/>
+    <https://pandas.pydata.org/docs/>`__
+
 .. [#ufl] `https://github.com/object-oriented-python/ufl
     <https://github.com/object-oriented-python/ufl>`__
 

doc/source/9_trees_and_directed_acyclic_graphs.rst

@@ -395,8 +395,8 @@ We'll consider postorder traversal first, as it's the easier to implement.
         tree: TreeNode
             The tree to be visited.
         fn: function(node, *fn_children)
-            A function to be applied at each node. The function should take the
-            node to be visited as its first argument, and the results of
+            A function to be applied at each node. The function should take
+            the node to be visited as its first argument, and the results of
             visiting its children as any further arguments.
         """
         return fn(tree, *(postvisitor(c, fn) for c in tree.children))
@@ -480,8 +480,8 @@ call :func:`previsitor` on the child nodes.
         tree: TreeNode
             The tree to be visited.
         fn: function(node, fn_parent)
-            A function to be applied at each node. The function should take the
-            node to be visited as its first argument, and the result of
+            A function to be applied at each node. The function should take
+            the node to be visited as its first argument, and the result of
             visiting its parent as the second.
         """
         fn_out = fn(tree, fn_parent)
@@ -776,7 +776,8 @@ function.
             Any keyword arguments required to evaluate specific types of
             expression.
         symbol_map: dict
-            A dictionary mapping Symbol names to numerical values, for example:
+            A dictionary mapping Symbol names to numerical values, for
+            example:
 
             {'x': 1}
         """
@@ -819,24 +820,24 @@ function.
         return o[0] ** o[1]
 
 Next we turn our attention to the implementation of evaluation for the different
-expression types. Look first at lines 27-29, which provide the evaluation of
+expression types. Look first at lines 28-30, which provide the evaluation of
 :class:`Number` nodes. The function body is trivial: the evaluation of a
 :class:`Number` is simply its value. The function interface is more interesting.
 Notice that the function name is given as `_`. 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 27. The single dispatch
+declared name. Instead, look at the decorator on line 28. The single dispatch
 function :func:`~example_code.expression_tools.evaluate` has a :term:`method`
 :meth:`register`. When used as a decorator, the :meth:`register` method of a
 single dispatch function registers the function that follows as implementation
 for the :keyword:`class` given as an argument to :meth:`register`. On this
 occasion, this is :class:`expressions.Number`.
 
-Now look at lines 32-34. These contain the implementation of
+Now look at lines 33-35. These contain the implementation of
 :func:`~example_code.expression_tools.evaluate` for :class:`expressions.Symbol`.
 In order to evaluate a symbol, we depend on the mapping from symbol names to
 numerical values that has been passed in. 
 
-Finally, look at lines 37-39. These define the evaluation visitor for addition.
+Finally, look at lines 38-40. These define the evaluation visitor for addition.
 This works simply by adding the results of evaluating the two operands of
 :class:`expressions.Add`. The evaluation visitors for the other operators
 follow in an analogous manner.
@@ -869,8 +870,8 @@ function.
         expr: Expression
             The expression to be visited.
         fn: function(node, *o, **kwargs)
-            A function to be applied at each node. The function should take the
-            node to be visited as its first argument, and the results of
+            A function to be applied at each node. The function should take
+            the node to be visited as its first argument, and the results of
             visiting its operands as any further positional arguments. Any
             additional information that the visitor requires can be passed in
             as keyword arguments.

doc/source/_static/poptitle.sty

@@ -67,7 +67,7 @@
 %     }
 %  %\rule{15mm,297mm}
 %\end{textblock}
-\begin{textblock}{175}(17.5,74.25)
+\begin{textblock}{154}(17.5,74.25)
     \setlength{\parskip}{2ex}
     {\sffamily\fontsize{25}{30}\selectfont\noindent\thetitle}
 
@@ -83,7 +83,7 @@
 \mbox{}
 \pagebreak
 
-\begin{textblock}{175}[0,1](17.5,230.5)
+\begin{textblock}{146}[0,1](17.5,230.5)
     {
      %\hypersetup{urlcolor=imperialblue}
     \sffamily\fontsize{12}{14}\selectfont