Merged my branch with mainline.
authorPuneeth Chaganti <punchagan@fossee.in>
Fri, 09 Oct 2009 12:28:30 +0530
changeset 83 be8c9a71135f
parent 82 e352b67ab357 (diff)
parent 81 b13ee158ea30 (current diff)
child 84 338b85a9c864
child 90 18687fadbc08
Merged my branch with mainline.
--- a/day2/session2.tex	Fri Oct 09 12:13:40 2009 +0530
+++ b/day2/session2.tex	Fri Oct 09 12:28:30 2009 +0530
@@ -150,7 +150,7 @@
     \includegraphics[height=0.7in, interpolate=true]{data/broadcast_scalar}
   \end{columns}
   \begin{itemize}
-    \item Allows functions to take inputs not of the same shape
+    \item Allows functions to take inputs that are not of the same shape
     \item 2 rules -
       \begin{enumerate}
       \item 1 is (repeatedly) prepended to shapes of smaller arrays
@@ -177,8 +177,9 @@
 \begin{frame}[fragile]
   \frametitle{Copies \& Views}
   Try it!
+  \vspace{-0.1in}
   \begin{lstlisting}
-    >>> a = np.array([[1,2,3],[4,5,6]])
+    >>> a = np.arange(1,9); a.shape=3,3
     >>> b = a
     >>> b is a
     >>> b[0,0]=0; print a
@@ -195,9 +196,8 @@
 \begin{frame}[fragile]
   \frametitle{Copies \& Views}
   Try it!
+  \vspace{-0.1in}
   \begin{lstlisting}
-    >>> a = np.arange(1,9)
-    >>> a.shape=3,3
     >>> b = a[0,1:3]
     >>> c = a[0::2,0::2]
     >>> a.flags.owndata