Workshop materials: comparison day1/session2.tex

equal deleted inserted replaced

-:6af6441034f9
+:162e3e453920
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{Additional Plotting Attributes}
 \begin{itemize}
-\item \kwrd{'o'} - Filled circles
+\item \typ{'o'} - Filled circles
-\item \kwrd{'.'} - Small Dots
+\item \typ{'.'} - Small Dots
-\item \kwrd{'-'} - Lines
+\item \typ{'-'} - Lines
-\item \kwrd{'- -'} - Dashed lines
+\item \typ{'--'} - Dashed lines
 \end{itemize}
 \end{frame}
 \section{Lists}
 \begin{frame}[fragile]
 \frametitle{Lists: Introduction}
 \begin{lstlisting}
-In []: x = [0, 1, 2, 3]
+In []: x = [4, 2, 1, 3]
 In []: y = [7, 11, 15, 19]
 \end{lstlisting}
 What are \typ{x} and \typ{y}?\\
 \begin{lstlisting}
 In []: mtlist = []
 \end{lstlisting}
 \emphbar{Empty List}
 \begin{lstlisting}
-In []: a = [ 1, 2, 3, 4, 5]
+In []: a = [ 5, 2, 3, 1, 4]
 In []: a[0]+a[1]+a[-1]
-Out[]: 8
+Out[]: 11
 \end{lstlisting}
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{List: Slicing}
 \begin{block}{Remember\ldots}
-	\kwrd{In []: a = [ 1, 2, 3, 4, 5]}
+	\kwrd{In []: a = [ 5, 2, 3, 1, 4]}
 \end{block}
 \begin{lstlisting}
 In []: a[1:3]
 Out[]: [2, 3]
 \end{lstlisting}
 \emphbar{A slice}
 \begin{lstlisting}
 In []: a[1:-1]
-Out[]: [2, 3, 4]
+Out[]: [2, 3, 1]
 \end{lstlisting}
 \alert{\typ{list[initial:final]}}
 \end{frame}
 %% more on list slicing
 \begin{frame}[fragile]
 \frametitle{List operations}
 \begin{lstlisting}
-In []: b = [ 6, 7, 8, 9]
+In []: b = [ 8, 6, 9, 9]
 In []: c = a + b
 In []: c
-Out[]: [1, 2, 3, 4, 5, 6, 7, 8, 9]
+Out[]: [5, 2, 3, 1, 4, 8, 6, 9, 9]
 In []: a.append(6)
 In []: a
-Out[]: [ 1, 2, 3, 4, 5, 6]
+Out[]: [5, 2, 3, 1, 4, 6]
 \end{lstlisting}
 %\inctime{10}
 \end{frame}
 \section{Simple Pendulum}
 In []: for time in t:
 ....:     tsq.append(time*time)
 ....:
 ....:
+\end{lstlisting}
+Hit the ``ENTER'' key twice to come to the previous indentation level
+\begin{lstlisting}
+In []: print tsq
+\end{lstlisting}
+\kwrd{tsq} is the list of squares of \typ{t} values.
+\end{frame}
+\begin{frame}[fragile]
+\frametitle{Plotting $L$ vs $T^2$ \ldots}
+\begin{lstlisting}
 In []: plot(l, tsq)
 Out[]: [<matplotlib.lines.Line2D object at 0xa5b05ac>]
 \end{lstlisting}
-This gives \kwrd{tsq} which is the list of squares of \typ{t} values.
+This gives the required plot.
-\end{frame}
-\begin{frame}[fragile]
-\frametitle{How to come out of the \texttt{for} loop?}
-Hit the ``ENTER'' key twice to come to the previous indentation level
-\begin{lstlisting}
-In []: for time in t:
-....:     tsq.append(time*time)
-....:
-....:
-In []: print tsq
-\end{lstlisting}
-\end{frame}
-\begin{frame}[fragile]
 \begin{figure}
-\includegraphics[width=3.5in]{data/L-TSq-limited.png}
+\includegraphics[width=2.2in]{data/L-TSq-limited.png}
 \end{figure}
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{What about larger data sets?}
 t.append(float(point[1]))
 tsq = []
 for time in t:
 tsq.append(time*time)
 plot(l, tsq, '.')
+show()
 \end{lstlisting}
 \end{frame}
 \begin{frame}
 \frametitle{Save and run}
 t.append(float(point[1]))
 tsq = []
 for time in t:
 tsq.append(time*time)
 plot(l, tsq, '.')
+show()
 \end{lstlisting}
 \end{frame}
 \begin{frame}[fragile]
 \begin{figure}

changeset 358	162e3e453920
parent 352	b44d7bcc6609
child 359	cb17c87b090e