summaryrefslogtreecommitdiff
path: root/day1/session2.tex
diff options
context:
space:
mode:
Diffstat (limited to 'day1/session2.tex')
-rw-r--r--day1/session2.tex62
1 files changed, 33 insertions, 29 deletions
diff --git a/day1/session2.tex b/day1/session2.tex
index 13efd55..635220e 100644
--- a/day1/session2.tex
+++ b/day1/session2.tex
@@ -179,10 +179,10 @@ Out[]: <matplotlib.text.Text object at 0x98746ec>
\begin{frame}[fragile]
\frametitle{Additional Plotting Attributes}
\begin{itemize}
- \item \typ{'o'} - Filled circles
- \item \typ{'.'} - Small Dots
- \item \typ{'-'} - Lines
- \item \typ{'--'} - Dashed lines
+ \item \kwrd{'o'} - Filled circles
+ \item \kwrd{'.'} - Small Dots
+ \item \kwrd{'-'} - Lines
+ \item \kwrd{'- -'} - Dashed lines
\end{itemize}
\end{frame}
@@ -190,7 +190,7 @@ Out[]: <matplotlib.text.Text object at 0x98746ec>
\begin{frame}[fragile]
\frametitle{Lists: Introduction}
\begin{lstlisting}
- In []: x = [4, 2, 1, 3]
+ In []: x = [0, 1, 2, 3]
In []: y = [7, 11, 15, 19]
@@ -208,17 +208,17 @@ In []: mtlist = []
\end{lstlisting}
\emphbar{Empty List}
\begin{lstlisting}
-In []: a = [ 5, 2, 3, 1, 4]
+In []: a = [ 1, 2, 3, 4, 5]
In []: a[0]+a[1]+a[-1]
-Out[]: 11
+Out[]: 8
\end{lstlisting}
\end{frame}
\begin{frame}[fragile]
\frametitle{List: Slicing}
\begin{block}{Remember\ldots}
- \kwrd{In []: a = [ 5, 2, 3, 1, 4]}
+ \kwrd{In []: a = [ 1, 2, 3, 4, 5]}
\end{block}
\begin{lstlisting}
In []: a[1:3]
@@ -227,7 +227,7 @@ Out[]: [2, 3]
\emphbar{A slice}
\begin{lstlisting}
In []: a[1:-1]
-Out[]: [2, 3, 1]
+Out[]: [2, 3, 4]
\end{lstlisting}
\alert{\typ{list[initial:final]}}
\end{frame}
@@ -236,15 +236,15 @@ Out[]: [2, 3, 1]
\begin{frame}[fragile]
\frametitle{List operations}
\begin{lstlisting}
-In []: b = [ 8, 6, 9, 9]
+In []: b = [ 6, 7, 8, 9]
In []: c = a + b
In []: c
-Out[]: [5, 2, 3, 1, 4, 8, 6, 9, 9]
+Out[]: [1, 2, 3, 4, 5, 6, 7, 8, 9]
In []: a.append(6)
In []: a
-Out[]: [5, 2, 3, 1, 4, 6]
+Out[]: [ 1, 2, 3, 4, 5, 6]
\end{lstlisting}
%\inctime{10}
\end{frame}
@@ -303,23 +303,29 @@ 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 the required plot.
+This gives \kwrd{tsq} which is the list of squares of \typ{t} values.
+\end{frame}
+
+\begin{frame}[fragile]
+ \frametitle{How to come out of the \texttt{for} loop?}
+ Hit the ``ENTER'' key twice to return 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=2.2in]{data/L-TSq-limited.png}
+\includegraphics[width=3.5in]{data/L-TSq-limited.png}
\end{figure}
\end{frame}
@@ -353,7 +359,7 @@ $ cat pendulum.txt
\begin{frame}[fragile]
\frametitle{Plotting from \typ{pendulum.txt}}
-Type the following in an editor. Save as \typ{pend\_pl.py}
+Open a new script and type the following:
\begin{lstlisting}
l = []
t = []
@@ -365,15 +371,14 @@ tsq = []
for time in t:
tsq.append(time*time)
plot(l, tsq, '.')
-show()
\end{lstlisting}
\end{frame}
\begin{frame}
\frametitle{Save and run}
\begin{itemize}
- \item Save as \typ{pend\_pl.py}
- \item Run using \kwrd{\%run -i pend\_pl.py}
+ \item Save as pendulum\_plot.py.
+ \item Run using \kwrd{\%run -i pendulum\_plot.py}
\end{itemize}
\end{frame}
@@ -452,7 +457,6 @@ tsq = []
for time in t:
tsq.append(time*time)
plot(l, tsq, '.')
-show()
\end{lstlisting}
\end{frame}