summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramit@shrike.aero.iitb.ac.in2010-05-10 22:46:29 +0530
committeramit@shrike.aero.iitb.ac.in2010-05-10 22:46:29 +0530
commitdaea157260c9b9a975ac8041af58f6acb914ec3d (patch)
tree76050065bdb5c3b7c8013091fbfadd9d23c98dbd
parent3bdb797e77bbd672e96260d3ffa025ec38dfc705 (diff)
downloadworkshops-more-scipy-daea157260c9b9a975ac8041af58f6acb914ec3d.tar.gz
workshops-more-scipy-daea157260c9b9a975ac8041af58f6acb914ec3d.tar.bz2
workshops-more-scipy-daea157260c9b9a975ac8041af58f6acb914ec3d.zip
Changes from BHU workshop . changed variable names in list intro . pendulum.pychanged to pendulum_plot.py . Also an extra space added on slide 33 session1 day1
-rw-r--r--day1/session1.tex2
-rw-r--r--day1/session2.tex20
2 files changed, 11 insertions, 11 deletions
diff --git a/day1/session1.tex b/day1/session1.tex
index f7d9335..4ac6941 100644
--- a/day1/session1.tex
+++ b/day1/session1.tex
@@ -555,7 +555,7 @@ Use the \typ{\%save} \alert{magic} command of IPython
\end{block}
Line numbers can be specified individually separated by commas or as a range separated by a dash.\\
\begin{block}{}
-\typ{\%save four_plot.py} \alert{\typ{16 18-27}} \\
+\typ{\%save four_plot.py} \alert{\typ{ 16 18-27}} \\
\end{block}
This saves from the history the commands entered on line numbers \alert{16, 18, 19, 20, \ldots 27}
\end{frame}
diff --git a/day1/session2.tex b/day1/session2.tex
index f994c5d..eec1af8 100644
--- a/day1/session2.tex
+++ b/day1/session2.tex
@@ -129,17 +129,17 @@
Do we plot analytical functions or experimental data?
\begin{small}
\begin{lstlisting}
-In []: x = [0, 1, 2, 3]
+In []: time = [0, 1, 2, 3]
-In []: y = [7, 11, 15, 19]
+In []: distance = [7, 11, 15, 19]
-In []: plot(x, y)
+In []: plot(time,distance)
Out[]: [<matplotlib.lines.Line2D object at 0xa73aa8c>]
-In []: xlabel('X')
+In []: xlabel('time')
Out[]: <matplotlib.text.Text object at 0x986e9ac>
-In []: ylabel('Y')
+In []: ylabel('distance')
Out[]: <matplotlib.text.Text object at 0x98746ec>
\end{lstlisting}
\end{small}
@@ -160,11 +160,11 @@ Out[]: <matplotlib.text.Text object at 0x98746ec>
\begin{lstlisting}
In []: clf()
- In []: plot(x, y, 'o')
+ In []: plot(time, distance, 'o')
Out[]: [<matplotlib.lines.Line2D object at 0xac17e0c>]
In []: clf()
- In []: plot(x, y, '.')
+ In []: plot(time, distance, '.')
Out[]: [<matplotlib.lines.Line2D object at 0xac17e0c>]
\end{lstlisting}
\end{frame}
@@ -190,9 +190,9 @@ Out[]: <matplotlib.text.Text object at 0x98746ec>
\begin{frame}[fragile]
\frametitle{Lists: Introduction}
\begin{lstlisting}
- In []: x = [0, 1, 2, 3]
+ In []: time = [0, 1, 2, 3]
- In []: y = [7, 11, 15, 19]
+ In []: distance = [7, 11, 15, 19]
\end{lstlisting}
What are \typ{x} and \typ{y}?\\
@@ -363,7 +363,7 @@ In []: cat pendulum.txt
\begin{frame}[fragile]
\frametitle{Plotting from \typ{pendulum.txt}}
Open a new script\\
-Save as \typ{pendulum.py} after typing first line
+Save as \typ{pendulum_plot.py} after typing first line
\begin{lstlisting}
L = []
t = []