# HG changeset patch
# User Madhusudan.C.S <madhusudancs@gmail.com>
# Date 1262094911 -19800
# Node ID 2214b5dba4d4ee98f1d7083fee6f34b10111c536
# Parent  25b18b51be4174fbfbc27d589a5027e0f211776d# Parent  c1bfec797af67d7212eedeaaa571edf7aa6afeb9
Merged the branches.

diff -r c1bfec797af6 -r 2214b5dba4d4 day1quiz1.tex
--- a/day1quiz1.tex	Wed Dec 23 14:17:02 2009 +0530
+++ b/day1quiz1.tex	Tue Dec 29 19:25:11 2009 +0530
@@ -154,8 +154,12 @@
 %%   \end{lstlisting}
 %% \end{frame}
 
-\begin{frame}[fragile]
+\begin{frame}
 \frametitle{\incqno }
+What ipython magic command do you use to obtain the lines of code you have already typed in the interpreter? What command do you use to save them?
+\end{frame}
+
+\begin{frame}
 \begin{lstlisting}
 In []: sc = {'A': 10, 'B': 20, 
              'C': 70}
@@ -234,6 +238,38 @@
 Write the code to read a file \texttt{data.txt} and print each line of it?
 \end{frame}
 
+\begin{frame}[fragile]
+\frametitle{\incqno }
+What is the output of:
+\begin{lstlisting}
+In []: x=linspace(0 , 2 * pi)
+In []: plot(x, cos(x),'go')
+\end{lstlisting}
+\end{frame}
+
+\begin{frame}
+\frametitle{\incqno }
+Draw a plot with line width 3.
+\end{frame}
+
+\begin{frame}
+\frametitle{\incqno }
+Setting x and y axis limits.
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{\incqno }
+The following code snippet has an error/bug:
+\begin{lstlisting}
+In []: l = [0.1, 0.2, 0.3, 0.4]
+In []: t = [0.69, 0.90, 1.19, 1.30]
+In []: tsq = []
+In []: for time in t:
+ ....:     tsq.append(time*time)
+ ....:     plot(l, tsq)
+\end{lstlisting}
+
+What is the error? How do you fix it?
+\end{frame}
 
 \end{document}
-
diff -r c1bfec797af6 -r 2214b5dba4d4 day2quiz.tex
--- a/day2quiz.tex	Wed Dec 23 14:17:02 2009 +0530
+++ b/day2quiz.tex	Tue Dec 29 19:25:11 2009 +0530
@@ -88,18 +88,6 @@
 0.5.
 \end{frame}
 
-\begin{frame}[fragile]
-\frametitle{\incqno }
-  What happens when we run this code?
-  \begin{lstlisting}
-a = False
-b = True
-c = True
-if a and b or c:
-    print "You are correct!"
-  \end{lstlisting}
-\end{frame}
-
 \begin{frame}
 \frametitle{\incqno }
   What is the difference between \kwrd{print} \emph{x} and \kwrd{print} \emph{x,} ?
@@ -134,7 +122,7 @@
 \begin{frame}[fragile]
     \frametitle{\incqno}
   \begin{lstlisting}
-In []: 47%3 
+In []: 47 % 3 
   \end{lstlisting}
   What is the output?
 \end{frame}
diff -r c1bfec797af6 -r 2214b5dba4d4 schedule.tex
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/schedule.tex	Tue Dec 29 19:25:11 2009 +0530
@@ -0,0 +1,48 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Tutorial slides on Python.
+%
+% Author: FOSSEE <info at fossee  dot in>
+% Copyright (c) 2005-2009, FOSSEE Team
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\documentclass[14pt]{article}
+
+\title{Python for Science and Engineering: Schedule}
+\author{FOSSEE Team}
+\date{14, 15 December, 2009}
+
+\begin{document}
+  \maketitle
+  Day 1, 14 December, 2009 \\
+  \begin{tabular}{| p{.35in} | p{2in} | p{1in} |}
+    \hline
+    Session & Title & Time \\\hline
+    1 & Interactive Plotting & 09:30 - 10:30 \\\hline
+    2 & Plotting experimental data & 10:35 - 11:35 \\\hline
+    & Tea Break & 11:35 - 11:50 \\\hline
+    3 & Statistics & 11:55 - 12:55 \\\hline
+    & Lunch Break & 12:55 - 13:50 \\\hline
+    & Quiz 1 & 13:50 - 14:05 \\\hline
+    4 & Matrices \& Least Square Fit & 14:10 - 15:10 \\\hline
+    5 & Exercises & 15:15 - 16:15 \\\hline
+    & Tea Break & 16:15 - 16:30 \\\hline
+    6 & Matrices \& Least Square Fit & 16:30 - 17:30 \\\hline
+    & Quiz 2 & 17:30 - 17:45 \\\hline
+  \end{tabular}
+  \vspace*{.5in}
+  \\ Day 2, 15 December, 2009 \\
+  \begin{tabular}{| p{.35in} | p{2in} | p{1in} |}
+    \hline
+    Session & Title & Time \\\hline
+    1 & Python language: Basics & 09:00 - 10:00 \\\hline
+    2 & Python language: Data structures and functions & 10:05 - 11:05 \\\hline
+    & Tea Break & 11:05 - 11:20 \\\hline
+    3 & Python language: Functions, modules and objects & 11:25 - 12:25 \\\hline
+    4 & Python Development & 12:25 - 13:25 \\\hline
+    & Lunch Break & 13:25 - 14:20 \\\hline
+    & Quiz 3 & 14:20 - 14:40 \\\hline
+    5 & Exercises & 14:40 - 15:40 \\\hline
+    & Tea Break & 15:40 - 16:00 \\\hline
+    6 & Exercises contd \ldots & 16:00 - 16:30 \\\hline
+  \end{tabular}
+\end{document}