# HG changeset patch
# User Puneeth Chaganti <punchagan@fossee.in>
# Date 1256628940 -19800
# Node ID e59ab9ab1a899641bd43bae0e7f9190c22199be2
# Parent  9efa777af2e20eadd26d4e5d0bfd4a8435b95549
Manual Merge with Mainline.

diff -r 9efa777af2e2 -r e59ab9ab1a89 day1/session3.tex
--- a/day1/session3.tex	Tue Oct 27 12:50:19 2009 +0530
+++ b/day1/session3.tex	Tue Oct 27 13:05:40 2009 +0530
@@ -303,7 +303,7 @@
 \frametitle{Dealing with data whole-sale}
 \begin{lstlisting}
 In []: for t in T:
- ....:     Tsq.append(t*t)
+ ....:     TSq.append(t*t)
 \end{lstlisting}
 \begin{itemize}
 \item This is not very efficient
@@ -313,7 +313,7 @@
 \begin{lstlisting}
 In []: L = array(L)
 In []: T = array(T)
-In []: Tsq = T*T
+In []: TSq = T*T
 \end{lstlisting}
 \end{frame}
 
@@ -401,7 +401,7 @@
 \item Along with a lot of things, it returns the least squares solution
 \end{itemize}
 \begin{lstlisting}
-In []: coef, res, r, s = lstsq(A,Tsq)
+In []: coef, res, r, s = lstsq(A,TSq)
 \end{lstlisting}
 \end{frame}
 
@@ -424,6 +424,9 @@
   \begin{itemize}
    \item Dictionaries
    \item Drawing pie charts
+   \item Arrays
+   \item Least Square fitting
+   \item Intro to Matrices
   \end{itemize}
 \end{frame}
 \end{document}
diff -r 9efa777af2e2 -r e59ab9ab1a89 day1/session4.tex
--- a/day1/session4.tex	Tue Oct 27 12:50:19 2009 +0530
+++ b/day1/session4.tex	Tue Oct 27 13:05:40 2009 +0530
@@ -255,7 +255,7 @@
 \end{itemize}
 \begin{lstlisting}
 In []: x = 0
-In []: integrate.quad(sin(x)+x**2, 0, 1)
+In []: quad(sin(x)+x**2, 0, 1)
 \end{lstlisting}
 \alert{\typ{error:}}
 \typ{First argument must be a callable function.}
@@ -266,7 +266,7 @@
 \begin{lstlisting}
 In []: def f(x):
            return sin(x)+x**2
-In []: integrate.quad(f, 0, 1)
+In []: quad(f, 0, 1)
 \end{lstlisting}
 \begin{itemize}
 \item \typ{def}
@@ -338,9 +338,13 @@
 \begin{frame}[fragile]
 \frametitle{Quadrature \ldots}
 \begin{lstlisting}
-In []: integrate.quad(f, 0, 1)
+In []: quad(f, 0, 1)
 \end{lstlisting}
 Returns the integral and an estimate of the absolute error in the result.
+\begin{itemize}
+\item Use \typ{dblquad} for Double integrals
+\item Use \typ{tplquad} for Triple integrals
+\end{itemize}
 \end{frame}
 
 \subsection{ODEs}
@@ -403,5 +407,25 @@
 \end{lstlisting}
 \end{frame}
 
+\begin{frame}
+  \frametitle{Things we have learned}
+  \begin{itemize}
+  \item
+  \item
+  \item Functions
+    \begin{itemize}
+    \item Definition
+    \item Calling
+    \item Default Arguments
+    \item Keyword Arguments
+    \end{itemize}
+    \item Integration
+    \begin{itemize}
+      \item Quadrature
+      \item ODEs
+    \end{itemize}
+  \end{itemize}
+\end{frame}
+
 \end{document}