From d8fb796e8787f0ac104025fd836ed1797fde20f9 Mon Sep 17 00:00:00 2001
From: Shantanu
Date: Sat, 3 Oct 2009 20:02:38 +0530
Subject: Corrected screwed up merge.

---
 day2/session1.tex | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'day2/session1.tex')

diff --git a/day2/session1.tex b/day2/session1.tex
index b36b3c2..9fce148 100644
--- a/day2/session1.tex
+++ b/day2/session1.tex
@@ -222,7 +222,6 @@ array([10,11,12,-1])
       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}
@@ -327,11 +326,12 @@ array([[ 0.96276665,  0.77174861],
 \begin{itemize}
   \item Also: PNG, PDF, PS, EPS, SVG, PDF
 \end{itemize}
+\inctime{5}
 \end{frame}
        
 \subsection{Plots - Lines, Labels and Legends}
 \begin{frame}[fragile]
-  \frametitle{Basic plotting}
+  \frametitle{Tweaking plots}
 \begin{lstlisting}
 # Set properties of objects:
 >>> l, = plot(x, sin(x))
@@ -369,6 +369,7 @@ array([[ 0.96276665,  0.77174861],
 \begin{frame}[fragile]
   \frametitle{Legends}
 \begin{lstlisting}
+>>> x = linspace(0, 2*pi, 1000)
 >>> plot(x, cos(5*x), 'r--', 
          label='cosine')
 >>> plot(x, sin(5*x), 'g--', 
@@ -376,8 +377,6 @@ array([[ 0.96276665,  0.77174861],
 >>> legend() 
 # Or use:
 >>> legend(['cosine', 'sine'])
-# Annotation:
->>> text(1,0, '(1,0)')
 \end{lstlisting}
 \end{frame}
 
@@ -406,6 +405,7 @@ pylab.plot(x, pylab.sin(x))
 # Can also use:
 from pylab import linspace, sin, plot
 \end{lstlisting}
+\inctime{5}
 \end{frame}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -703,6 +703,7 @@ title('triangular head; scale '\
     \tiny
     For details see \url{http://matplotlib.sourceforge.net/screenshots/plotmap.py}
   \end{center}
+\inctime{5}
 \end{frame}
 
 
@@ -713,8 +714,6 @@ title('triangular head; scale '\
   \item \url{http://matplotlib.sf.net/tutorial.html}
   \item \url{http://matplotlib.sf.net/screenshots.html}
   \end{itemize}
-
-  \inctime{25}
 \end{frame}
 
 \begin{frame}
@@ -749,5 +748,4 @@ title('triangular head; scale '\
 \end{columns}
 \inctime{20}
 \end{frame}
-
 \end{document}
-- 
cgit