Workshop materials: comparison day2/session1.tex

equal deleted inserted replaced

-:2281002b579b
+:84c3f600045f
 \typ{less (<)}, \typ{greater (>)} etc.
 \item Trig and other functions: \typ{sin(x), arcsin(x), sinh(x),
 exp(x), sqrt(x)} etc.
 \item \typ{sum(x, axis=0), product(x, axis=0), dot(a, bp)}   \inctime{10}
 \end{itemize}
+\inctime{10}
 \end{frame}
 \subsection{Array Creation \& Slicing, Striding Arrays}
 \begin{frame}[fragile]
 \frametitle{Array creation functions}
 \end{itemize}
 \end{frame}
 \subsection{Plots - Lines, Labels and Legends}
 \begin{frame}[fragile]
-\frametitle{Basic plotting \ldots}
+\frametitle{Basic plotting}
 \begin{lstlisting}
 # Set properties of objects:
 >>> l, = plot(x, sin(x))
 # Why "l,"?
 >>> setp(l, linewidth=2.0, color='r')
 >>> close() # Close figure.
 \end{lstlisting}
 \end{frame}
 \begin{frame}[fragile]
-\frametitle{Multiple figures}
+\frametitle{Working with text \ldots}
+%\begin{itemize}
-\begin{lstlisting}
+%  \item We already saw LaTeX markup support!
->>> figure(1)
+%\end{itemize}
->>> plot(x, sin(x))
+\begin{lstlisting}
->>> figure(2)
+>>> w = arange(-2,2,.1)
->>> plot(x, tanh(x))
+>>> plot(w,exp(-(w*w))*cos)
->>> figure(1)
+>>> ylabel('$f(\omega)$')
->>> title('Easy as 1,2,3')
+>>> xlabel('$\omega$')
+>>> title(r"$f(\omega)=e^{-\omega^2}
+cos({\omega^2})$")
+>>> annotate('maxima',xy=(0, 1),
+xytext=(1, 0.8),
+arrowprops=dict(
+facecolor='black',
+shrink=0.05))
 \end{lstlisting}
 \end{frame}
 \begin{frame}[fragile]
-\frametitle{Legends and Annotation}
+\frametitle{Legends}
 \begin{lstlisting}
 >>> plot(x, cos(5*x), 'r--',
 label='cosine')
 >>> plot(x, sin(5*x), 'g--',
 label='sine')
 >>> text(1,0, '(1,0)')
 \end{lstlisting}
 \end{frame}
 \begin{frame}[fragile]
-\frametitle{More commands \ldots}
+\frametitle{Multiple figures}
-\begin{lstlisting}
-# semilog, loglog
+\begin{lstlisting}
->>> x = 10.**(-arange(100)*0.1)
+>>> figure(1)
->>> semilogx(x, x)
+>>> plot(x, sin(x))
->>> semilogy(x, x)
+>>> figure(2)
->>> loglog(x, x)
+>>> plot(x, tanh(x))
->>> loglog(x, x*x)
+>>> figure(1)
-\end{lstlisting}
+>>> title('Easy as 1,2,3')
-\end{frame}
+\end{lstlisting}
-\begin{frame}[fragile]
-\frametitle{More plots \ldots}
-\begin{lstlisting}
->>> clf()
->>> t = arange(0.1, 4, 0.1)
->>> s = exp(-t)
->>> e = 0.1*abs(randn(len(s)))
->>> errorbar(t, s, e)
-# Scatter plots
->>> clf()
->>> t = randn(len(e))
->>> scatter(t, e, c=s)
-\end{lstlisting}
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{Note: \typ{pylab} in Python scripts}
 \begin{lstlisting}
 \end{block}
 \end{columns}
 \end{frame}
 \begin{frame}[fragile] \frametitle{Maps}
-\includegraphics[height=2.5in, interpolate=true]{data/plotmap}
+\includegraphics[height=2.3in, interpolate=true]{data/plotmap}
 \begin{center}
 \tiny
 For details see \url{http://matplotlib.sourceforge.net/screenshots/plotmap.py}
 \end{center}
 \end{frame}

changeset 10	84c3f600045f
parent 9	2281002b579b
parent 8	41bdf277c755
child 12	996fb264fbe2