Merging changes
authoramit
Tue, 26 Oct 2010 16:19:36 +0530
changeset 352 68ec23cfef49
parent 351 054117c9dd59 (current diff)
parent 348 3f70aeb1e115 (diff)
child 359 35fc94bf7673
Merging changes
progress.org
--- a/accessing-pieces-arrays/script.rst	Tue Oct 26 16:08:02 2010 +0530
+++ b/accessing-pieces-arrays/script.rst	Tue Oct 26 16:19:36 2010 +0530
@@ -37,6 +37,8 @@
 
 {{{ switch back to the terminal }}}
 
+.. #[[Anoop: context switch, switch to next slide should be added]]
+
 As usual, we start IPython, using 
 ::
 
@@ -66,7 +68,9 @@
 
 ::
 
-  A[1]
+  A[2]
+
+.. #[[Anoop: should be A[2], corrected it]]
 
 Like lists, indexing starts from 0 in arrays, too. So, 34, the
 third element has the index 2. 
@@ -130,6 +134,8 @@
 
 Following is an exercise that you must do. 
 
+.. #[[Anoop: add context switches, switch to next slide]]
+
 %%1%% Change the last column of C to zeroes. 
 
 Please, pause the video here. Do the exercises and then continue. 
@@ -148,6 +154,8 @@
 
 Following is an exercise that you must do. 
 
+.. #[[Anoop: add context switches, switch to next slide]]
+
 %%2%% Change ``A`` to ``[11, 12, 13, 14, 15]``. 
 
 Please, pause the video here. Do the exercises and then continue. 
@@ -194,6 +202,10 @@
 
 To check the dimensions of any array, we can use the method
 shape. We say
+
+.. #[[Anoop: method is a function and .shape is a tuple, so it can be named
+   as value or something instead of the term method.]]
+
 ::
 
   I.shape 
@@ -230,12 +242,16 @@
 
 Following is an exercise that you must do. 
 
+.. #[[Anoop: add context switches, switch to next slide]]
+
 %%3%% First, obtain the elements [22, 23] from C. Then, obtain the
 elements [11, 21, 31, 41] from C. Finally, obtain the elements [21,
 31, 41, 0]. 
 
 Please, pause the video here. Do the exercises and then continue. 
 
+.. #[[Anoop: add context switches, switch to next slide]]
+
 ::
 
   C[1, 1:3] 
@@ -270,10 +286,14 @@
 
 Following is an exercise that you must do. 
 
+.. #[[Anoop: add context switches, switch to next slide]]
+
 %%4%% Obtain the elements [[23, 24], [33, -34]] from C. 
 
 Please, pause the video here. Do the exercises and then continue. 
 
+.. #[[Anoop: add context switches, switch to next slide]]
+
 ::
 
   C[1:3, 2:4] 
@@ -298,10 +318,14 @@
 
 Following is an exercise that you must do. 
 
+.. #[[Anoop: add context switches, switch to next slide]]
+
 %%5%% Obtain the square in the center of the image.
 
 Following is an exercise that you must do. 
 
+.. #[[Anoop: add context switches, switch to next slide]]
+
 ::
 
   imshow(I[75:225, 75:225])
@@ -335,6 +359,10 @@
 
 gives the elements, [[21, 23, 0], [41, 43, 0]]
 
+.. #[[Anoop: I think you forgot to "add switch to next slide" context
+   switch, I think it will be better you review the scripts(all) for
+   context switches and add them.]]
+
 Following is an exercise that you must do. 
 
 %%6%% Obtain the following. 
@@ -382,6 +410,12 @@
 also learnt how to modify arrays, element wise or in larger
 pieces.
 
+.. #[[Anoop: I think in the summary slide it is better to use single &
+   multi dimensional arrays instead of 1D and Multi dimensional arrays.]]
+
+.. #[[Anoop: switch to thank you slide, added comment as it most probably
+   won't be noticed]]
+
 Thank You!
 
 .. 
--- a/accessing-pieces-arrays/slides.tex	Tue Oct 26 16:08:02 2010 +0530
+++ b/accessing-pieces-arrays/slides.tex	Tue Oct 26 16:19:36 2010 +0530
@@ -1,4 +1,4 @@
-% Created 2010-10-10 Sun 18:48
+% Created 2010-10-26 Tue 12:11
 \documentclass[presentation]{beamer}
 \usepackage[latin1]{inputenc}
 \usepackage[T1]{fontenc}
@@ -8,6 +8,7 @@
 \usepackage{float}
 \usepackage{wrapfig}
 \usepackage{soul}
+\usepackage{t1enc}
 \usepackage{textcomp}
 \usepackage{marvosym}
 \usepackage{wasysym}
@@ -56,8 +57,7 @@
 \frametitle{Sample Arrays}
 \label{sec-2}
 
-\lstset{language=Python}
-\begin{lstlisting}
+\begin{verbatim}
 In []: A = array([12, 23, 34, 45, 56])
 
 In []: C = array([[11, 12, 13, 14, 15],
@@ -65,7 +65,7 @@
                   [31, 32, 33, 34, 35],
                   [41, 42, 43, 44, 45],
                   [51, 52, 53, 54, 55]])
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 \begin{frame}
 \frametitle{Question 1}
@@ -77,10 +77,9 @@
 \frametitle{Solution 1}
 \label{sec-4}
 
-\lstset{language=Python}
-\begin{lstlisting}
+\begin{verbatim}
 In []:  C[:, -1] = 0
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 \begin{frame}
 \frametitle{Question 2}
@@ -92,10 +91,9 @@
 \frametitle{Solution 2}
 \label{sec-6}
 
-\lstset{language=Python}
-\begin{lstlisting}
+\begin{verbatim}
 In []:  A[:] = [11, 12, 13, 14, 15]
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 \begin{frame}
 \frametitle{squares.png}
@@ -119,12 +117,11 @@
 \frametitle{Solution 3}
 \label{sec-9}
 
-\lstset{language=Python}
-\begin{lstlisting}
+\begin{verbatim}
 In []:  C[1, 1:3]
 In []:  C[0:4, 0]
 In []:  C[1:5, 0]
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 \begin{frame}
 \frametitle{Question 4}
@@ -136,10 +133,9 @@
 \frametitle{Solution 4}
 \label{sec-11}
 
-\lstset{language=Python}
-\begin{lstlisting}
+\begin{verbatim}
 In []:  C[1:3, 2:4]
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 \begin{frame}
 \frametitle{Question 5}
@@ -151,31 +147,28 @@
 \frametitle{Solution 5}
 \label{sec-13}
 
-\lstset{language=Python}
-\begin{lstlisting}
+\begin{verbatim}
 In []: imshow(I[75:225, 75:225])
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{Question 6}
 \label{sec-14}
 
   Obtain the following
-\lstset{language=Python}
-\begin{lstlisting}
+\begin{verbatim}
 [[12, 0], [42, 0]]
 [[12, 13, 14], [0, 0, 0]]
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{Solution 6}
 \label{sec-15}
 
-\lstset{language=Python}
-\begin{lstlisting}
+\begin{verbatim}
 In []: C[::3, 1::3]
 In []: C[::4, 1:4]
-\end{lstlisting}
+\end{verbatim}
 \end{frame}
 \begin{frame}
 \frametitle{Summary}
--- a/getting-started-ipython/script.rst	Tue Oct 26 16:08:02 2010 +0530
+++ b/getting-started-ipython/script.rst	Tue Oct 26 16:19:36 2010 +0530
@@ -16,7 +16,7 @@
 .. should have ``ipython`` and ``pylab`` installed. 
      
 .. Author              : Puneeth 
-   Internal Reviewer   : 
+   Internal Reviewer   : Anoop Jacob Thomas<anoop@fossee.in>
    External Reviewer   :
    Checklist OK?       : <put date stamp here, if OK> [2010-10-05]
 
@@ -73,6 +73,8 @@
 at the prompt. IPython promptly gives back the output as 3.  Notice
 that the output is displayed with an ``Out[1]`` indication.
 
+.. #[[Anoop: I think we can illustrate In [] and Out[] in slides]]
+
 Let's try out few other mathematical operations.
 ::
 
@@ -95,6 +97,10 @@
 expression to the required one.  We hit enter to see the output of
 ``print``. 
 
+.. #[[Anoop: We could create a slide with heading Tab Completion and
+   give the question as an exercise, basically I feel more slides
+   should be used]]
+
 Now, let's say we want to use the function ``round``. We type ``ro``
 at the prompt and hit the tab key. As you can see, the IPython
 completes the command. This feature is called the tab-completion.
@@ -105,6 +111,8 @@
 
 Following is an exercise that you must do. 
 
+.. #[[Anoop: Include slides for exercises]]
+
 %%1%% Type ``ab`` and hit tab to see what happens. Next, just type
 ``a`` and hit tab to see what happens.
 
@@ -116,6 +124,9 @@
 Now, let's see what these functions are used for.  We will use the
 help features of ipython to find this out.
 
+.. #[[Anoop: Another slide which says about ? mark and round? etc, as
+   few people cannot just follow by listening (like me) :)]]
+
 To get the help of any function, we first type the function, ``abs``
 in our case and then add a ? at the end and hit enter.
 
@@ -136,6 +147,8 @@
 
 Following is an exercise that you must do. 
 
+.. #[[Anoop: add slide]]
+
 %%2%% Look-up the documentation of ``round`` and see how to use it.
 
 Please, pause the video here. Do the exercise and then continue. 
@@ -153,6 +166,8 @@
 
 Following are exercises that you must do. 
 
+.. #[[Anoop: add slide]]
+
 %%3%% Check the output of::
 
   round(2.48)
@@ -186,6 +201,8 @@
 
 Following is an exercise that you must do. 
 
+.. #[[Anoop: add slide]]
+
 %%4%% Try typing round(2.484, and hit enter. and then cancel the
 command using Ctrl-C. Then, type the command, round(2.484, 2) and
 resume the video.
@@ -202,6 +219,9 @@
 This brings us to the end of the tutorial on getting started with
 ``ipython``.
 
+.. #[[Anoop: add slides for interrupts, navigating history, I feel
+    even a single point will also do]]
+
 In this tutorial we have learnt, how to
 {{{ show the outline/summary slide. }}}
 
@@ -218,4 +238,3 @@
 
 Hope you have enjoyed and found it useful.
 Thank you!
-
--- a/getting-started-ipython/slides.tex	Tue Oct 26 16:08:02 2010 +0530
+++ b/getting-started-ipython/slides.tex	Tue Oct 26 16:19:36 2010 +0530
@@ -1,4 +1,4 @@
-% Created 2010-10-10 Sun 17:34
+% Created 2010-10-26 Tue 10:33
 \documentclass[presentation]{beamer}
 \usepackage[latin1]{inputenc}
 \usepackage[T1]{fontenc}
@@ -8,6 +8,7 @@
 \usepackage{float}
 \usepackage{wrapfig}
 \usepackage{soul}
+\usepackage{t1enc}
 \usepackage{textcomp}
 \usepackage{marvosym}
 \usepackage{wasysym}
--- a/progress.org	Tue Oct 26 16:08:02 2010 +0530
+++ b/progress.org	Tue Oct 26 16:19:36 2010 +0530
@@ -1,6 +1,6 @@
 | S.No    | Name                                   | Units | Author   | Review                                | Checklist |
 |---------+----------------------------------------+-------+----------+---------------------------------------+-----------|
-| 1.2 LO: | getting started with =ipython=         |     2 | Punch    | Pending                               |           |
+| 1.2 LO: | getting started with =ipython=         |     2 | Punch    | Anoop (Done)                          |           |
 | 1.3 LO: | using the =plot= command interactively |     2 | Amit     |                                       |           |
 | 1.4 LO: | embellishing a plot                    |     2 | Nishanth | Anoop (Done)                          |           |
 | 1.5 LO: | saving plots                           |     2 | Anoop    |                                       |           |
@@ -22,32 +22,33 @@
 | 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    | Pending                               |           |
+| 4.2 LO: | accessing parts of arrays              |     4 | Punch    | Anoop (Done)                          |           |
 | 4.3 LO: | Matrices                               |     3 | Anoop    | Punch (changes before further 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     |                                       |           |
-| 5.3 LO: | using Sage                             |     4 | Punch    | Pending                               |           |
+| 5.3 LO: | using Sage                             |     4 | Punch    | Anoop (Pending)                       |           |
 | 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 | Puneeth  |                                       |           |
+| 6.4 LO: | loops                                  |     2 | Puneeth  | Anoop(Pending)                        |           |
 | 6.5 LO: | Assessment                             |     3 | Anoop    |                                       |           |
 |---------+----------------------------------------+-------+----------+---------------------------------------+-----------|
 | 7.1 LO: | manipulating lists                     |     3 | Madhu    |                                       |           |
-| 7.2 LO: | manipulating strings                   |     2 | Punch    | Amit                                  |           |
+| 7.2 LO: | manipulating strings                   |     2 | Punch    | Anoop (Pending)                       |           |
+| 7.2 LO: | manipulating strings                   |     2 | Punch    | Anoop (Pending)                       |           |
 | 7.3 LO: | getting started with tuples            |     2 | Nishanth |                                       |           |
 | 7.4 LO: | dictionaries                           |     2 | Anoop    | Pending                               |           |
 | 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    | Pending                               |           |
+| 8.2 LO: | advanced features of functions         |     3 | Punch    | Anoop (Pending)                       |           |
 | 8.3 LO: | using python modules                   |     3 | Anoop    | Pending                               |           |
 | 8.4 LO: | writing python scripts                 |     2 | Nishanth |                                       |           |
 | 8.5 LO: | testing and debugging                  |     2 | Amit     |                                       |           |