# HG changeset patch # User Puneeth Chaganti # Date 1288164226 -19800 # Node ID 21c3761c31391440229930117f59d3c0f1469bac # Parent 8f6b3acb39ecf5cac25d17ca89c6fe00425fe855 Merged heads. diff -r 8f6b3acb39ec -r 21c3761c3139 accessing-pieces-arrays/script.rst --- a/accessing-pieces-arrays/script.rst Wed Oct 27 12:50:10 2010 +0530 +++ b/accessing-pieces-arrays/script.rst Wed Oct 27 12:53:46 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! .. diff -r 8f6b3acb39ec -r 21c3761c3139 accessing-pieces-arrays/slides.tex --- a/accessing-pieces-arrays/slides.tex Wed Oct 27 12:50:10 2010 +0530 +++ b/accessing-pieces-arrays/slides.tex Wed Oct 27 12:53:46 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} diff -r 8f6b3acb39ec -r 21c3761c3139 getting-started-ipython/script.rst --- a/getting-started-ipython/script.rst Wed Oct 27 12:50:10 2010 +0530 +++ b/getting-started-ipython/script.rst Wed Oct 27 12:53:46 2010 +0530 @@ -16,7 +16,7 @@ .. should have ``ipython`` and ``pylab`` installed. .. Author : Puneeth - Internal Reviewer : + Internal Reviewer : Anoop Jacob Thomas External Reviewer : Checklist 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! - diff -r 8f6b3acb39ec -r 21c3761c3139 getting-started-ipython/slides.tex --- a/getting-started-ipython/slides.tex Wed Oct 27 12:50:10 2010 +0530 +++ b/getting-started-ipython/slides.tex Wed Oct 27 12:53:46 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} diff -r 8f6b3acb39ec -r 21c3761c3139 manipulating-strings/script.rst --- a/manipulating-strings/script.rst Wed Oct 27 12:50:10 2010 +0530 +++ b/manipulating-strings/script.rst Wed Oct 27 12:53:46 2010 +0530 @@ -17,7 +17,7 @@ .. #. basic datatypes .. Author : Puneeth - Internal Reviewer : + Internal Reviewer : Amit External Reviewer : Checklist OK? : [2010-10-05] @@ -36,6 +36,7 @@ .. #[punch: reversed returns an iterator. should we still teach it?] + We have an ``ipython`` shell open, in which we are going to work, through out this session. @@ -59,7 +60,7 @@ ``s`` could be in any of the forms --- sat, saturday, Sat, Saturday, -SAT, SATURDAY. We shall now be solving the problem only for the forms, +SAT, SATURDAY. For now, shall now be solving the problem only for the forms, sat and saturday. We shall solve it for the other forms, at the end of the tutorial. @@ -69,6 +70,7 @@ exists in the variable ``week``. As, with any of the string data-types, strings can be sliced into +.. #[Amit: Sequence data type???] sub-strings. To get the first three characters of s, we say, :: @@ -82,7 +84,7 @@ using ``s[-1]``. Following is an exercise that you must do. - +.. #[Amit: I don't know I am not sure about the sentence formation.] %%1%% Obtain the sub-string excluding the first and last characters from the string s. @@ -127,7 +129,7 @@ :: s[::-1] - +.. #[amit: I think using reversed in not required after this] Now, to check if the string is ``s`` is palindromic, we say :: @@ -157,6 +159,9 @@ Note that these methods, do not change the original string, but return a new string. +.. #[amit: I wish we could include this right when s.upper() is used so +.. that it is clear] + Following is an exercise that you must do. %%2%% Check if ``s`` is a valid name of a day of the week. Change the @@ -171,6 +176,8 @@ s.lower()[:3] in week +.. #[amit: May be a sentence or two about what our original problem was and +.. how this helps in solving it. One can loose the flow.] We just convert any input string to lower case and then check if it is present in the list ``week``.