Merging heads
authorAmit Sethi
Tue, 09 Nov 2010 01:31:55 +0530
changeset 407 abfd357603c2
parent 406 a534e9e79599 (current diff)
parent 405 ae4bcaff1dde (diff)
child 411 e227c45b0c3f
child 414 f76622c8cbd9
Merging heads
--- a/matrices/script.rst	Tue Nov 09 01:28:00 2010 +0530
+++ b/matrices/script.rst	Tue Nov 09 01:31:55 2010 +0530
@@ -30,6 +30,7 @@
    External Reviewer   :
    Checklist OK?       : <put date stamp here, if OK> [2010-10-05]
 
+.. #[punch: please mark the exercises, using the syntax we decided upon.]
 
 ========
 Matrices
@@ -41,9 +42,10 @@
 {{{ switch to next slide, outline slide }}}
 
 In this tutorial we will learn about matrices, creating matrices using
-direct data, by converting a list, matrix operations. Finding inverse
-of a matrix, determinant of a matrix, eigen values and eigen vectors
-of a matrix, norm and singular value decomposition of matrices.
+direct data, by converting a list and matrix operations. Finding
+inverse of a matrix, determinant of a matrix, eigen values and eigen
+vectors of a matrix, norm and singular value decomposition of
+matrices.
 
 {{{ creating a matrix }}}
 
@@ -158,6 +160,8 @@
 
 {{{ switch to next slide, Frobenius norm of inverse of matrix }}}
 
+.. #[punch: arange has not been introduced.]
+
 Now let us try to find out the Frobenius norm of inverse of a 4 by 4
 matrix, the matrix being,
 ::
@@ -177,6 +181,11 @@
 
     im5 = inv(m5)
 
+.. #[punch: we don't need to show this way of calculating the norm, do
+.. we? even if we do, we should show it in the "array style".
+.. something like:
+.. sqrt(sum(each * each))]
+
 And the Frobenius norm of the matrix ``im5`` can be found out as,
 ::
 
@@ -186,12 +195,14 @@
     print sqrt(sum)
 
 {{{ switch to next slide, infinity norm }}}
+.. #[punch: similarly for this section.]
 
 Now try to find out the infinity norm of the matrix im5. The infinity
 norm of a matrix is defined as the maximum value of sum of the
 absolute of elements in each row. Pause here and try to solve the
 problem yourself.
 
+
 The solution for the problem is,
 ::
 
@@ -242,6 +253,9 @@
 
     eig(m5)
 
+
+.. #[punch: has the tuple word been introduced?]
+
 Note that it returned a tuple of two matrices. The first element in
 the tuple are the eigen values and the second element in the tuple are
 the eigen vectors. Thus the eigen values are,
@@ -300,5 +314,5 @@
    mode: rst
    indent-tabs-mode: nil
    sentence-end-double-space: nil
-   fill-column: 75
+   fill-column: 70
    End:
--- a/progress.org	Tue Nov 09 01:28:00 2010 +0530
+++ b/progress.org	Tue Nov 09 01:31:55 2010 +0530
@@ -1,56 +1,56 @@
-| S.No    | Name                                   | Units | Author   | Review                              | Checklist |
-|---------+----------------------------------------+-------+----------+-------------------------------------+-----------|
-| 1.2 LO: | getting started with =ipython=         |     2 | Punch    | Anoop(Done)                         |           |
-| 1.3 LO: | using the =plot= command interactively |     2 | Amit     | Pending                             |           |
-| 1.4 LO: | embellishing a plot                    |     2 | Nishanth | Anoop (Done)                        |           |
-| 1.5 LO: | saving plots                           |     2 | Anoop    | Punch (Done)                        |           |
-| 1.6 LO: | multiple plots                         |     3 | Madhu    | Nishanth (Done)                     |           |
-| 1.7 LO: | additional features of IPython         |     2 | Nishanth | Amit (Pending)                      |           |
-| 1.8 LO: | module level assessment                |     3 | Madhu    |                                     |           |
-|---------+----------------------------------------+-------+----------+-------------------------------------+-----------|
-| 2.2 LO: | loading data from files                |     3 | Punch    | Nishanth (Done)                     |           |
-| 2.3 LO: | plotting the data                      |     3 | Amit     | Pending                             |           |
-| 2.4 LO: | other types of plots                   |     3 | Anoop    | Punch (Done)                        |           |
-| 2.5 LO: | module level assessment                |     3 | Nishanth |                                     |           |
-|---------+----------------------------------------+-------+----------+-------------------------------------+-----------|
-| 3.1 LO: | getting started with lists             |     2 | Amit     | Pending                             |           |
-| 3.2 LO: | getting started with =for=             |     2 | Anoop    | Nishanth (Done)                     |           |
-| 3.3 LO: | getting started with strings           |     2 | Madhu    |                                     |           |
-| 3.4 LO: | getting started with files             |     3 | Punch    | Anoop(Done)                         |           |
-| 3.5 LO: | parsing data                           |     3 | Nishanth | Amit (Done)                         |           |
-| 3.6 LO: | statistics                             |     2 | Amit     | Punch (Done)                        |           |
-| 3.7 LO: | module level assessment                |     3 | Madhu    |                                     |           |
-|---------+----------------------------------------+-------+----------+-------------------------------------+-----------|
-| 4.1 LO: | getting started with arrays            |     2 | Anoop    | Punch (Done)                        |           |
-| 4.2 LO: | accessing parts of arrays              |     4 | Punch    | Anoop (Done)                        |           |
-| 4.3 LO: | Matrices                               |     3 | Anoop    | Punch (changes made, please review) |           |
-| 4.4 LO: | Least square fit                       |     2 | Nishanth | Punch (Done)                        |           |
-| 4.5 LO: | Assessment                             |     3 | Punch    |                                     |           |
-|---------+----------------------------------------+-------+----------+-------------------------------------+-----------|
-| 5.1 LO: | getting started with sage notebook     |     3 | Madhu    |                                     |           |
-| 5.2 LO: | getting started with symbolics         |     3 | Amit     | Pending                             |           |
-| 5.3 LO: | using Sage                             |     4 | Punch    | Anoop (Done)                        |           |
-| 5.4 LO: | using sage to teach                    |     3 | Nishanth |                                     |           |
-| 5.5 LO: | Assessment                             |     3 | Anoop    |                                     |           |
-|---------+----------------------------------------+-------+----------+-------------------------------------+-----------|
-| 6.1 LO: | basic datatypes & operators            |     4 | Amit     | Punch (Done)                        |           |
-| 6.2 LO: | I/O                                    |     1 | Nishanth |                                     |           |
-| 6.3 LO: | conditionals                           |     2 | Madhu    |                                     |           |
-| 6.4 LO: | loops                                  |     2 | Punch    | Anoop (Done)                        |           |
-| 6.5 LO: | Assessment                             |     3 | Anoop    |                                     |           |
-|---------+----------------------------------------+-------+----------+-------------------------------------+-----------|
-| 7.1 LO: | manipulating lists                     |     3 | Madhu    |                                     |           |
-| 7.2 LO: | manipulating strings                   |     2 | Punch    | Amit(Done)                          |           |
-| 7.3 LO: | getting started with tuples            |     2 | Nishanth |                                     |           |
-| 7.4 LO: | dictionaries                           |     2 | Anoop    | Punch (Done)                        |           |
-| 7.5 LO: | sets                                   |     2 | Nishanth |                                     |           |
-| 7.6 LO: | Assessment                             |     3 | Amit     |                                     |           |
-|---------+----------------------------------------+-------+----------+-------------------------------------+-----------|
-| 8.1 LO: | getting started with functions         |     3 | Nishanth |                                     |           |
-| 8.2 LO: | advanced features of functions         |     3 | Punch    | Anoop (Done)                        |           |
-| 8.3 LO: | using python modules                   |     3 | Anoop    | Punch (Done)                        |           |
-| 8.4 LO: | writing python scripts                 |     2 | Nishanth |                                     |           |
-| 8.5 LO: | testing and debugging                  |     2 | Amit     |                                     |           |
-| 8.6 LO: | Assessment                             |     3 | Madhu    |                                     |           |
-|---------+----------------------------------------+-------+----------+-------------------------------------+-----------|
+| S.No    | Name                                   | Units | Author   | Review          | Checklist |
+|---------+----------------------------------------+-------+----------+-----------------+-----------|
+| 1.2 LO: | getting started with =ipython=         |     2 | Punch    | Anoop(Done)     |           |
+| 1.3 LO: | using the =plot= command interactively |     2 | Amit     | Pending         |           |
+| 1.4 LO: | embellishing a plot                    |     2 | Nishanth | Anoop (Done)    |           |
+| 1.5 LO: | saving plots                           |     2 | Anoop    | Punch (Done)    |           |
+| 1.6 LO: | multiple plots                         |     3 | Madhu    | Nishanth (Done) |           |
+| 1.7 LO: | additional features of IPython         |     2 | Nishanth | Amit (Pending)  |           |
+| 1.8 LO: | module level assessment                |     3 | Madhu    |                 |           |
+|---------+----------------------------------------+-------+----------+-----------------+-----------|
+| 2.2 LO: | loading data from files                |     3 | Punch    | Nishanth (Done) |           |
+| 2.3 LO: | plotting the data                      |     3 | Amit     | Pending         |           |
+| 2.4 LO: | other types of plots                   |     3 | Anoop    | Punch (Done)    |           |
+| 2.5 LO: | module level assessment                |     3 | Nishanth |                 |           |
+|---------+----------------------------------------+-------+----------+-----------------+-----------|
+| 3.1 LO: | getting started with lists             |     2 | Amit     | Pending         |           |
+| 3.2 LO: | getting started with =for=             |     2 | Anoop    | Nishanth (Done) |           |
+| 3.3 LO: | getting started with strings           |     2 | Madhu    |                 |           |
+| 3.4 LO: | getting started with files             |     3 | Punch    | Anoop(Done)     |           |
+| 3.5 LO: | parsing data                           |     3 | Nishanth | Amit (Done)     |           |
+| 3.6 LO: | statistics                             |     2 | Amit     | Punch (Done)    |           |
+| 3.7 LO: | module level assessment                |     3 | Madhu    |                 |           |
+|---------+----------------------------------------+-------+----------+-----------------+-----------|
+| 4.1 LO: | getting started with arrays            |     2 | Anoop    | Punch (Done)    |           |
+| 4.2 LO: | accessing parts of arrays              |     4 | Punch    | Anoop (Done)    |           |
+| 4.3 LO: | Matrices                               |     3 | Anoop    | Punch (Done)    |           |
+| 4.4 LO: | Least square fit                       |     2 | Nishanth | Punch (Done)    |           |
+| 4.5 LO: | Assessment                             |     3 | Punch    |                 |           |
+|---------+----------------------------------------+-------+----------+-----------------+-----------|
+| 5.1 LO: | getting started with sage notebook     |     3 | Madhu    |                 |           |
+| 5.2 LO: | getting started with symbolics         |     3 | Amit     | Pending         |           |
+| 5.3 LO: | using Sage                             |     4 | Punch    | Anoop (Done)    |           |
+| 5.4 LO: | using sage to teach                    |     3 | Nishanth |                 |           |
+| 5.5 LO: | Assessment                             |     3 | Anoop    |                 |           |
+|---------+----------------------------------------+-------+----------+-----------------+-----------|
+| 6.1 LO: | basic datatypes & operators            |     4 | Amit     | Punch (Done)    |           |
+| 6.2 LO: | I/O                                    |     1 | Nishanth |                 |           |
+| 6.3 LO: | conditionals                           |     2 | Madhu    |                 |           |
+| 6.4 LO: | loops                                  |     2 | Punch    | Anoop (Done)    |           |
+| 6.5 LO: | Assessment                             |     3 | Anoop    |                 |           |
+|---------+----------------------------------------+-------+----------+-----------------+-----------|
+| 7.1 LO: | manipulating lists                     |     3 | Madhu    |                 |           |
+| 7.2 LO: | manipulating strings                   |     2 | Punch    | Amit(Done)      |           |
+| 7.3 LO: | getting started with tuples            |     2 | Nishanth |                 |           |
+| 7.4 LO: | dictionaries                           |     2 | Anoop    | Punch (Done)    |           |
+| 7.5 LO: | sets                                   |     2 | Nishanth |                 |           |
+| 7.6 LO: | Assessment                             |     3 | Amit     |                 |           |
+|---------+----------------------------------------+-------+----------+-----------------+-----------|
+| 8.1 LO: | getting started with functions         |     3 | Nishanth |                 |           |
+| 8.2 LO: | advanced features of functions         |     3 | Punch    | Anoop (Done)    |           |
+| 8.3 LO: | using python modules                   |     3 | Anoop    | Punch (Done)    |           |
+| 8.4 LO: | writing python scripts                 |     2 | Nishanth |                 |           |
+| 8.5 LO: | testing and debugging                  |     2 | Amit     |                 |           |
+| 8.6 LO: | Assessment                             |     3 | Madhu    |                 |           |
+|---------+----------------------------------------+-------+----------+-----------------+-----------|