diff options
Diffstat (limited to 'day1')
| -rw-r--r-- | day1/session2.tex | 6 | ||||
| -rw-r--r-- | day1/session3.tex | 14 | ||||
| -rwxr-xr-x | day1/session6.tex | 23 |
3 files changed, 25 insertions, 18 deletions
diff --git a/day1/session2.tex b/day1/session2.tex index 54dbd37..13efd55 100644 --- a/day1/session2.tex +++ b/day1/session2.tex @@ -353,7 +353,7 @@ $ cat pendulum.txt \begin{frame}[fragile] \frametitle{Plotting from \typ{pendulum.txt}} -Open a new script and type the following: +Type the following in an editor. Save as \typ{pend\_pl.py} \begin{lstlisting} l = [] t = [] @@ -372,8 +372,8 @@ show() \begin{frame} \frametitle{Save and run} \begin{itemize} - \item Save as pendulum\_plot.py. - \item Run using \kwrd{\%run -i pendulum\_plot.py} + \item Save as \typ{pend\_pl.py} + \item Run using \kwrd{\%run -i pend\_pl.py} \end{itemize} \end{frame} diff --git a/day1/session3.tex b/day1/session3.tex index 567a12c..135bfc1 100644 --- a/day1/session3.tex +++ b/day1/session3.tex @@ -142,13 +142,13 @@ \begin{frame}[fragile] \frametitle{Acceleration due to gravity - ``g''\ldots} \begin{lstlisting} -In []: G = [] +In []: g_list = [] In []: for line in open('pendulum.txt'): .... point = line.split() .... l = float(point[0]) .... t = float(point[1]) .... g = 4 * pi * pi * l / (t * t) - .... G.append(g) + .... g_list.append(g) \end{lstlisting} \end{frame} @@ -163,11 +163,11 @@ In []: for line in open('pendulum.txt'): \frametitle{Mean ``g''} \begin{lstlisting} In []: total = 0 -In []: for g in G: +In []: for g in g_list: ....: total += g ....: -In []: g_mean = total / len(G) +In []: g_mean = total / len(g_list) In []: print 'Mean: ', g_mean \end{lstlisting} \end{frame} @@ -175,7 +175,7 @@ In []: print 'Mean: ', g_mean \begin{frame}[fragile] \frametitle{Mean ``g''} \begin{lstlisting} -In []: g_mean = sum(G) / len(G) +In []: g_mean = sum(g_list) / len(g_list) In []: print 'Mean: ', g_mean \end{lstlisting} \end{frame} @@ -183,7 +183,7 @@ In []: print 'Mean: ', g_mean \begin{frame}[fragile] \frametitle{Mean ``g''} \begin{lstlisting} -In []: g_mean = mean(G) +In []: g_mean = mean(g_list) In []: print 'Mean: ', g_mean \end{lstlisting} \inctime{10} @@ -333,7 +333,6 @@ science = {} science = {} for record in open('sslc1.txt'): - record = record.strip() fields = record.split(';') region_code = fields[0].strip() @@ -396,7 +395,6 @@ savefig('science.png') math_scores = [] for record in open('sslc1.txt'): - record = record.strip() fields = record.split(';') score_str = fields[5].strip() diff --git a/day1/session6.tex b/day1/session6.tex index 71afcd3..a5c1a2c 100755 --- a/day1/session6.tex +++ b/day1/session6.tex @@ -250,10 +250,16 @@ Find the root of $sin(x)+cos^2(x)$ nearest to $0$ \frametitle{\typ{fsolve}} Root of $sin(x)+cos^2(x)$ nearest to $0$ \begin{lstlisting} -In []: fsolve(sin(x)+cos(x)**2, 0) +In []: fsolve(sin(x)+cos(x)*cos(x), 0) NameError: name 'x' is not defined +\end{lstlisting} +\end{frame} + +\begin{frame}[fragile] +\frametitle{\typ{fsolve}} +\begin{lstlisting} In []: x = linspace(-pi, pi) -In []: fsolve(sin(x)+cos(x)**2, 0) +In []: fsolve(sin(x)+cos(x)*cos(x), 0) \end{lstlisting} \begin{small} \alert{\typ{TypeError:}} @@ -266,7 +272,7 @@ In []: fsolve(sin(x)+cos(x)**2, 0) We have been using them all along. Now let's see how to define them. \begin{lstlisting} In []: def f(x): - return sin(x)+cos(x)**2 + return sin(x)+cos(x)*cos(x) \end{lstlisting} \begin{itemize} \item \typ{def} @@ -332,7 +338,8 @@ Out[]: -0.66623943249251527 \begin{lstlisting} In []: from scipy.integrate import odeint In []: def epid(y, t): - .... k, L = 0.00003, 25000 + .... k = 0.00003 + .... L = 25000 .... return k*y*(L-y) .... \end{lstlisting} @@ -382,8 +389,10 @@ We shall use the simple ODE of a simple pendulum. \end{itemize} \begin{lstlisting} In []: def pend_int(initial, t): - .... theta, omega = initial - .... g, L = 9.81, 0.2 + .... theta = initial[0] + .... omega = initial[1] + .... g = 9.81 + .... L = 0.2 .... f=[omega, -(g/L)*sin(theta)] .... return f .... @@ -397,7 +406,7 @@ In []: def pend_int(initial, t): \item \typ{initial} has the initial values \end{itemize} \begin{lstlisting} -In []: t = linspace(0, 10, 101) +In []: t = linspace(0, 20, 101) In []: initial = [10*2*pi/360, 0] \end{lstlisting} \end{frame} |