Merged Madhu and Mainline branches.

1 files changed, 2 insertions, 43 deletions

diff --git a/day2/3Dplotting.tex b/day2/session3.tex
index 16c0bd2..72fde4d 100644
--- a/day2/3Dplotting.tex
+++ b/day2/session3.tex
@@ -270,51 +270,10 @@
 \end{frame}
 
 \begin{frame}[fragile]
-    \frametitle{plotting 3-D Surface: $x^2+y^2-z^2=1$}
-    \begin{lstlisting}
-u,v = mgrid[-2:2:100j, -pi:pi:100j]
-x=sqrt(u*u+1)*cos(v)
-y=sqrt(u*u+1)*sin(v)
-z=u
-mlab.mesh(x,y,z)
-    \end{lstlisting}
-\begin{figure}
-\includegraphics[width=1in, height=1in, interpolate=true]{data/hyperboloid}
-\end{figure}
-\end{frame}
-
-\begin{frame}[fragile]
-    \frametitle{mgrid}    
-    \begin{itemize}
-      \item Creates a multidimensional ``meshgrid''
-      
-      \item In this particular case, creates 2 2D arrays: u,v.
-    \end{itemize}      
-    \begin{lstlisting}
-In []: mgrid[0:3,0:3]
-Out[]: 
-array([[[0, 0, 0],
-        [1, 1, 1],
-        [2, 2, 2]],
-
-       [[0, 1, 2],
-        [0, 1, 2],
-        [0, 1, 2]]])
-    \end{lstlisting}    
-\end{frame}
-
-\begin{frame}[fragile]
-    \frametitle{mesh}
-      \begin{itemize}
-        \item Plots a surface from data supplied as 2D arrays.
-      \end{itemize}      
-\end{frame}
-
-\begin{frame}[fragile]
     \frametitle{\mlab\ plotting functions}
     \begin{columns}
         \column{0.25\textwidth}
-        \myemph{Points in 3D space}
+        \myemph{\Large 0D data}
         \column{0.5\textwidth}
     \pgfimage[width=2in]{MEDIA/m2/mlab/points3d_ex}
     \end{columns}
@@ -331,7 +290,7 @@ array([[[0, 0, 0],
 \begin{frame}
   \begin{columns}
         \column{0.25\textwidth}
-        \myemph{Connected points in 3D space}
+        \myemph{\Large 1D data}
         \column{0.5\textwidth}
         \pgfimage[width=2.5in]{MEDIA/m2/mlab/plot3d_ex}
   \end{columns}