summaryrefslogtreecommitdiff
path: root/scipy
diff options
context:
space:
mode:
authorPrabhu Ramachandran2017-01-20 00:15:53 +0530
committerPrabhu Ramachandran2017-01-20 00:15:53 +0530
commit8330fe8d662979c47b6febb0c15c5d968e625b7f (patch)
tree599fd6f7c652b7ba3482b4849243e3728b5374c3 /scipy
parentc7296f44a04e94d0746d22e77913512edb7bf2fa (diff)
downloadpython-workshops-8330fe8d662979c47b6febb0c15c5d968e625b7f.tar.gz
python-workshops-8330fe8d662979c47b6febb0c15c5d968e625b7f.tar.bz2
python-workshops-8330fe8d662979c47b6febb0c15c5d968e625b7f.zip
Add images, fix a few Python 2.x specific issues.
Diffstat (limited to 'scipy')
-rw-r--r--scipy/basic/mlab_data/m2_app3_3.pngbin0 -> 197446 bytes
-rw-r--r--scipy/basic/mlab_data/m2_envisage.pngbin0 -> 228808 bytes
-rw-r--r--scipy/basic/mlab_data/m2_icon.pngbin0 -> 2881 bytes
-rw-r--r--scipy/basic/mlab_data/mlab_contour_window.pngbin0 -> 44774 bytes
-rw-r--r--scipy/basic/mlab_data/mlab_tui.pngbin0 -> 90882 bytes
-rw-r--r--scipy/basic/mlab_data/quiver3d_ex.pngbin0 -> 14494 bytes
-rw-r--r--scipy/basic/numpy.tex3
7 files changed, 2 insertions, 1 deletions
diff --git a/scipy/basic/mlab_data/m2_app3_3.png b/scipy/basic/mlab_data/m2_app3_3.png
new file mode 100644
index 0000000..b2870e6
--- /dev/null
+++ b/scipy/basic/mlab_data/m2_app3_3.png
Binary files differ
diff --git a/scipy/basic/mlab_data/m2_envisage.png b/scipy/basic/mlab_data/m2_envisage.png
new file mode 100644
index 0000000..377298e
--- /dev/null
+++ b/scipy/basic/mlab_data/m2_envisage.png
Binary files differ
diff --git a/scipy/basic/mlab_data/m2_icon.png b/scipy/basic/mlab_data/m2_icon.png
new file mode 100644
index 0000000..98d6cd3
--- /dev/null
+++ b/scipy/basic/mlab_data/m2_icon.png
Binary files differ
diff --git a/scipy/basic/mlab_data/mlab_contour_window.png b/scipy/basic/mlab_data/mlab_contour_window.png
new file mode 100644
index 0000000..3a250a1
--- /dev/null
+++ b/scipy/basic/mlab_data/mlab_contour_window.png
Binary files differ
diff --git a/scipy/basic/mlab_data/mlab_tui.png b/scipy/basic/mlab_data/mlab_tui.png
new file mode 100644
index 0000000..10938a6
--- /dev/null
+++ b/scipy/basic/mlab_data/mlab_tui.png
Binary files differ
diff --git a/scipy/basic/mlab_data/quiver3d_ex.png b/scipy/basic/mlab_data/quiver3d_ex.png
new file mode 100644
index 0000000..9c485ec
--- /dev/null
+++ b/scipy/basic/mlab_data/quiver3d_ex.png
Binary files differ
diff --git a/scipy/basic/numpy.tex b/scipy/basic/numpy.tex
index 27e20b6..0f5e17c 100644
--- a/scipy/basic/numpy.tex
+++ b/scipy/basic/numpy.tex
@@ -201,7 +201,7 @@ Out[]: array([0, 0, 0, 0])
\end{lstlisting}
\begin{itemize}
\item Operations are \alert{element-wise}
- \item Types matter
+ \item Types matter (only on Python 2.x)
\end{itemize}
\inctime{10}
\end{frame}
@@ -213,6 +213,7 @@ Out[]: array([0, 0, 0, 0])
In []: a = array([1.,2,3,4])
In []: a/b
\end{lstlisting}
+ This can happen on Python 2.x, so beware
\end{frame}
\begin{frame}[fragile]