moved functions to session 9

Author: PythonCHB

slides_sources/source/exercises/index.rst

@@ -50,8 +50,8 @@ Session 6:
 .. toctree::
     :maxdepth: 1
 
-    lambda_magic
-    trapezoid
+    args_kwargs_lab
+
 
 Session 7:
 ----------
@@ -66,5 +66,12 @@ Session 8:
     :maxdepth: 1
 
     circle_class
-
     sparse_array
+
+Session 9:
+----------
+.. toctree::
+    :maxdepth: 1
+
+    lambda_magic
+    trapezoid

slides_sources/source/session06.rst

@@ -605,21 +605,13 @@ Becomes:
 LAB
 ----
 
-.. rst-class:: medium
-
-  keyword arguments:
-
-* Write a function that has four optional parameters (with defaults):
+Time to play with all this to get a feel for it.
 
-  - fore_color
-  - back_color
-  - link_color
-  - visited_color
+:ref:`exercise_args_kwargs_lab`
 
-* Have it print the colors (use strings for the colors)
-* Call it with a couple different parameters set
-* Have it pull the parameters out with ``*args, **kwargs``
-  - and print those
+This is not all that clearly specified -- the goal is for you to
+experiment with various ways to define and call functions, so you
+can understand what's possible, and what happens with each call.
 
 
 =====================================

slides_sources/source/session07.rst

@@ -1,8 +1,22 @@
 .. include:: include.rst
 
-***************************************************
-Anonymous functions and Object Oriented programming
-***************************************************
+***************************
+Object Oriented programming
+***************************
+
+================
+Review/Questions
+================
+
+Review of Previous Class
+------------------------
+
+.. rst-class:: medium
+
+  Advanced Argument passing
+
+  Testing
+
 
 ===================
 Anonymous functions
@@ -168,6 +182,7 @@ Yes:
 
 But Guido thinks almost all uses of reduce are really ``sum()``
 
+
 Functional Programming
 ----------------------
 
@@ -218,6 +233,9 @@ lambda in keyword arguments
 
 Note when the keyword argument is evaluated: this turns out to be very handy!
 
+lambda in defaultdict
+---------------------
+
 ===
 LAB
 ===
@@ -443,73 +461,6 @@ Object Oriented Programming
   Overriding methods
 
 
-================
-Review/Questions
-================
-
-Review of Previous Class
-------------------------
-
-.. rst-class:: medium
-  Advanced Argument passing
-
-  Lambda
-
-  Functions as Objects
-
-Homework review
----------------
-
-Homework Questions?
-
-Did you all get a trapedzoidal rule function working?
-
-Anyone get the "passing through of arguments"?
-
-How about the adaptive solutions?
-
-
-Notes on Floating point
------------------------
-
-Did anyone look at the isclose() function?
-
-How to make a range of numbers in floating point?
-
-Anyone do something like this?:
-
-.. code-block:: python
-
-  s = []
-  x = a
-  while x <= b:
-      s.append(x)
-      x += delta_x
-
-  -- see my solution.
-
-Some notes about FP issues:
-
-https://docs.python.org/3.5/tutorial/floatingpoint.html
-
-Code Review
------------
-
-Anyone unsatisfied with their solution -- or stuck?
-
-Let's do a code review!
-
-
-Lightning Talks Today:
------------------------
-
-.. rst-class:: medium
-
-Charles E Robison
-
-Paul S Briant
-
-Paul Vosper
 
 
 ===========================