summaryrefslogtreecommitdiff
path: root/day1/session1.tex
diff options
context:
space:
mode:
authorPrabhu Ramachandran2010-06-21 03:47:30 -0400
committerPrabhu Ramachandran2010-06-21 03:47:30 -0400
commit5ac2499a36885ee40e392f9978de91675bdc869f (patch)
treed8f795bda3f76a0c92d57ec650b2c4f2130e6614 /day1/session1.tex
parentf3fa1e2f31ac2265501861632d8e1c3051ec0218 (diff)
parent098d1a0d329c2906bc25c68e4c94caef2dc886dc (diff)
downloadworkshops-5ac2499a36885ee40e392f9978de91675bdc869f.tar.gz
workshops-5ac2499a36885ee40e392f9978de91675bdc869f.tar.bz2
workshops-5ac2499a36885ee40e392f9978de91675bdc869f.zip
Merging changes from Chris.
--HG-- branch : scipy2010
Diffstat (limited to 'day1/session1.tex')
-rw-r--r--day1/session1.tex14
1 files changed, 7 insertions, 7 deletions
diff --git a/day1/session1.tex b/day1/session1.tex
index f29cff1..4c26942 100644
--- a/day1/session1.tex
+++ b/day1/session1.tex
@@ -159,11 +159,11 @@ Day 1, Session 1}
\item Editor - we recommend \alert{scite}
\item Data files:
\begin{itemize}
- \item \typ{sslc1.txt}
+ \item \typ{anag.txt}
+ \item \typ{holmes.txt}
\item \typ{pendulum.txt}
\item \typ{pos.txt}
- \item \typ{holmes.txt}
- \item \typ{anag.txt}
+ \item \typ{sslc1.txt}
\end{itemize}
\item Python scripts:
\begin{itemize}
@@ -531,9 +531,9 @@ In []: plot?
\vspace*{0.5in}
\item Try:
\begin{lstlisting}
-In []: plot?
+In []: plot??
\end{lstlisting}
- to see source code
+ to see the source code for \typ{plot}
\end{itemize}
@@ -558,7 +558,7 @@ In []: plot?
\frametitle{Review Problem \ldots}
\alert{Plotting \ldots}
\begin{lstlisting}
-In []: x=linspace(-5*pi, 5*pi, 500)
+In []: x = linspace(-5*pi, 5*pi, 500)
In []: plot(x, x, 'b')
In []: plot(x, -x, 'b')
In []: plot(x, sin(x), 'g', linewidth=2)
@@ -602,7 +602,7 @@ Use the \typ{\%save} \alert{magic} command of IPython
\begin{block}{}
\typ{\%save script_name line_numbers}
\end{block}
-Line numbers can be specified individually separated by commas or as a range separated by a dash.\\
+Line numbers can be specified individually separated by spaces or as a range separated by a dash.\\
\begin{block}{}
\typ{\%save four_plot.py} \alert{\typ{ 16 18-27}} \\
\end{block}