Changes to getting started with ipython based on review.

3 files changed, 116 insertions, 16 deletions

diff --git a/getting-started-ipython/script.rst b/getting-started-ipython/script.rst
index 5d8056c..4388683 100644
--- a/getting-started-ipython/script.rst
+++ b/getting-started-ipython/script.rst
@@ -74,6 +74,7 @@ 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]]
+.. #[[Puneeth: I think we can do that on the terminal?]]
 
 Let's try out few other mathematical operations.
 ::
@@ -97,10 +98,6 @@ then use the delete key to remove it and type 0 and * to change the
 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.
@@ -111,8 +108,6 @@ possibilities. It just lists out all the possible completions.
 
 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.
 
@@ -127,6 +122,9 @@ 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) :)]]
 
+.. #[Punch: These things are shown on the terminal.  I feel we don't
+.. need slide, here I guess.]
+
 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.
 
@@ -147,8 +145,6 @@ and we do get back 10.5.
 
 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. 
@@ -166,8 +162,6 @@ The function ``round``, rounds a number to a given precision.
 
 Following are exercises that you must do. 
 
-.. #[[Anoop: add slide]]
-
 %%3%% Check the output of::
 
   round(2.48)
@@ -201,8 +195,6 @@ prompt.
 
 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.
@@ -222,6 +214,8 @@ This brings us to the end of the tutorial on getting started with
 .. #[[Anoop: add slides for interrupts, navigating history, I feel
     even a single point will also do]]
 
+.. #[Puneeth: I don't feel these things cannot be shown on a slide.]
+
 In this tutorial we have learnt, how to
 {{{ show the outline/summary slide. }}}
 
diff --git a/getting-started-ipython/slides.org b/getting-started-ipython/slides.org
index ade1aae..d729cca 100644
--- a/getting-started-ipython/slides.org
+++ b/getting-started-ipython/slides.org
@@ -36,6 +36,44 @@
   + use tab-completion
   + look-up documentation of functions
   + interrupt incomplete or incorrect commands
+* Question 1
+  Type =ab= and hit tab to see what happens. Next, just type =a= and
+  hit tab to see what happens.
+* Solution 1
+  =ab= tab completes to =abs= and =a<tab>= gives us a list of all the
+  commands starting with a.
+* Question 2
+  Look-up the documentation of =round= and see how to use it.
+* Solution 2
+  =round?=
+* Question 3
+  Check the output of
+  #+begin_src python
+    round(2.48)
+    round(2.48, 1)
+    round(2.48, 2)
+    
+    round(2.484)
+    round(2.484, 1)
+    round(2.484, 2)
+  #+end_src 
+  Look-up the documentation of =round= and see how to use it.
+* Solution 3
+  We get 2.0, 2.5 and 2.48, which are what we expect. 
+* Question 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.
+* Solution 4
+  #+begin_src python
+    round(2.484 
+    ^C
+    
+    round(2.484, 2)
+  #+end_src 
+
+
+
 * Summary
   + invoking and quitting the ~ipython~ interpreter
   + navigating the history
diff --git a/getting-started-ipython/slides.tex b/getting-started-ipython/slides.tex
index 20af21e..310db35 100644
--- a/getting-started-ipython/slides.tex
+++ b/getting-started-ipython/slides.tex
@@ -1,4 +1,4 @@
-% Created 2010-10-26 Tue 10:33
+% Created 2010-11-05 Fri 20:59
 \documentclass[presentation]{beamer}
 \usepackage[latin1]{inputenc}
 \usepackage[T1]{fontenc}
@@ -8,7 +8,6 @@
 \usepackage{float}
 \usepackage{wrapfig}
 \usepackage{soul}
-\usepackage{t1enc}
 \usepackage{textcomp}
 \usepackage{marvosym}
 \usepackage{wasysym}
@@ -55,9 +54,78 @@ showstringspaces=false, keywordstyle=\color{blue}\bfseries}
 \end{itemize}
 \end{frame}
 \begin{frame}
-\frametitle{Summary}
+\frametitle{Question 1}
 \label{sec-2}
 
+  Type \texttt{ab} and hit tab to see what happens. Next, just type \texttt{a} and
+  hit tab to see what happens.
+\end{frame}
+\begin{frame}
+\frametitle{Solution 1}
+\label{sec-3}
+
+  \texttt{ab} tab completes to \texttt{abs} and \texttt{a<tab>} gives us a list of all the
+  commands starting with a.
+\end{frame}
+\begin{frame}
+\frametitle{Question 2}
+\label{sec-4}
+
+  Look-up the documentation of \texttt{round} and see how to use it.
+\end{frame}
+\begin{frame}
+\frametitle{Solution 2}
+\label{sec-5}
+
+  \texttt{round?}
+\end{frame}
+\begin{frame}[fragile]
+\frametitle{Question 3}
+\label{sec-6}
+
+  Check the output of
+\lstset{language=Python}
+\begin{lstlisting}
+round(2.48)
+round(2.48, 1)
+round(2.48, 2)
+
+round(2.484)
+round(2.484, 1)
+round(2.484, 2)
+\end{lstlisting}
+  Look-up the documentation of \texttt{round} and see how to use it.
+\end{frame}
+\begin{frame}
+\frametitle{Solution 3}
+\label{sec-7}
+
+  We get 2.0, 2.5 and 2.48, which are what we expect. 
+\end{frame}
+\begin{frame}
+\frametitle{Question 4}
+\label{sec-8}
+
+  Try typing \texttt{round(2.484}, and hit enter. and then cancel the command
+  using Ctrl-C. Then, type the command, \texttt{round(2.484, 2)} and resume
+  the video.
+\end{frame}
+\begin{frame}[fragile]
+\frametitle{Solution 4}
+\label{sec-9}
+
+\lstset{language=Python}
+\begin{lstlisting}
+round(2.484 
+^C
+
+round(2.484, 2)
+\end{lstlisting}
+\end{frame}
+\begin{frame}
+\frametitle{Summary}
+\label{sec-10}
+
 \begin{itemize}
 \item invoking and quitting the \texttt{ipython} interpreter
 \item navigating the history
@@ -68,7 +136,7 @@ showstringspaces=false, keywordstyle=\color{blue}\bfseries}
 \end{frame}
 \begin{frame}
 \frametitle{Thank you!}
-\label{sec-3}
+\label{sec-11}
 
   \begin{block}{}
   \begin{center}