Merging Chris and my changes.

--HG--
branch : scipy2010

1 files changed, 25 insertions, 16 deletions

diff --git a/plan.rst b/plan.rst
index 40e3573..b71972d 100644
--- a/plan.rst
+++ b/plan.rst
@@ -10,7 +10,7 @@ rather basic and we need to add more material to it or adjust the
 timings suitably.  What we will do is add rough timelines to each session
 as we go over the slides and also add more material as we see fit.
 
-  - Session 1: (PR/KD)  
+  - Session 1 (Mon 8:00): (PR/KD)
     - Checklist
     - Starting up IPython
     - Odds and ends
@@ -19,63 +19,72 @@ as we go over the slides and also add more material as we see fit.
     - Command history
     - Python scripts.
 
-  - Session 2: (KD)
+  - Session 2 (Mon 9:00): (KD)
     - Plotting Points
     - Lists
     - Simple pendulum
     - Strings
     - Summary
 
-  - Session 3: (CB)
+  - Session 3 (Mon 10:20): (CB)
     - Basic statistical calculations
     - Handling larger data (sslc data)
-        - Parsing data files
-        - Dictionaries
-        - Pie chart
-        - Arrays for efficiency
 
-  - Session 4: (PR)
+      - Parsing data files
+      - Dictionaries
+      - Pie chart
+      - Arrays for efficiency
+
+  - Session 4 (Mon 11:20): (PR)
     - Basic matrices.
     - Elementary image processing.
     - Add some image processing stuff here.
     - More matrices -- determinant, inverse.
     - Least squares fit for data.
 
-  - Session 5: (KD)
+  - Session 5 (Mon 13:40): (KD)
     - Exercises.
 
-  - Session 6: (PR)
+  - Session 6 (Mon 14:40): (CB)
     - Solving systems of equations.
     - Finding roots.
+
       - Introducing functions.
+    
     - Solving ODEs.
 
-  - Session 7 (Python language basics.): (KD)
+  - Session 7 (Mon 16:00) (Python language basics.): (KD)
+    - *day2 session1 material*
     - Data types, numbers, booleans, strings.
     - operators
     - simple i/o
     - basic control flow:  if/elif/else
 
-  - Session 8: (CB)
+  - Session 8 (Mon 15:00): (PR)
+    - *day2 session2 material*
     - Control flow (while, for, range etc.)
     - exercises.
     - Lists, tuples, dicts, sets.
     - Functions.
 
-  - Session 9: (CB)
+  - Session 9 (Tue 8:00): (CB)
+    - *day2 session3 material*
     - More on functions.
     - Modules.
     - Objects.
 
-  - Session 10 (Python development): (CB)
+  - Session 10 (Tue 9:00) (Python development): (CB)
+    - *day2 session4 material*
     - tests
     - coding style.
     - Debugging.
 
-  - Session 11: (PR + CB)
+  - Session 11 (Tue 10:20): (PR + CB)
+    - *day2 session5 material*
     - Exercises.
 
-  - Session 12: (PR)
+  - Session 12 (Tue 11:20): (PR)
+    - *day2 session6 material*
     - 3D plotting with Mayavi??