Branches merged.
authorSantosh G. Vattam <vattam.santosh@gmail.com>
Tue, 05 Jan 2010 15:23:02 +0530
changeset 341 7ae88b9da553
parent 340 347ff2714deb (diff)
parent 339 8ac5fe07810f (current diff)
child 342 f91a75802238
Branches merged.
day1/cheatsheet1.tex
day1/cheatsheet2.tex
day1/cheatsheet4.tex
day1/cheatsheet6.tex
day1/data/pos.txt
--- a/day1/cheatsheet1.tex	Mon Jan 04 19:54:26 2010 +0530
+++ b/day1/cheatsheet1.tex	Tue Jan 05 15:23:02 2010 +0530
@@ -65,7 +65,7 @@
 \subsection{label and title}
 \typ{In []: xlabel('Length') #sets *x* axis label to Length}\\ 
 \typ{In []: ylabel('Time') #sets *y* axis label to Time.}\\
-\typ{In []: title('Sinusoid') #sets title of plot}\\
+\typ{In []: title('Sinusoids') #sets title of plot}\\
 \\
 \textbf{Additionally}\\
 Pylab accepts TeX equation expressions in any text expression. To get something like:\\
@@ -78,7 +78,7 @@
 
 \subsection{legends}
 \typ{In []: legend('sin(x)',loc=center)} \\
-Place a legend on the current plot at location *loc*.\\
+Places a legend on the current plot at location *loc*.\\
 Apart from \typ{center}, some other \typ{loc} which can be specified are:
 \begin{lstlisting}
 'best'
--- a/day1/cheatsheet2.tex	Mon Jan 04 19:54:26 2010 +0530
+++ b/day1/cheatsheet2.tex	Tue Jan 05 15:23:02 2010 +0530
@@ -119,11 +119,11 @@
 Out[]: ['hello', 'world']
 In []: greet = ``hello, world''
 In []: print greet.split(',')
-Out[]: ['hello', ' world'] # Note the whitespace before 'world'
+Out[]: ['hello', ' world'] # Note the white space before 'world'
 \end{lstlisting}
 A string can be split based on the delimiter specified within quotes. A combination of more than one delimiter can also be used.\\
 \typ{In []: greet.split(', ')}\\
-\typ{Out[]: ['hello', 'world']}\\Note the whitespace is not there anymore.
+\typ{Out[]: ['hello', 'world']}\\Note the white space is not there anymore.
 \newpage
 \section{Plotting from Files}
 \subsection{Opening files}
--- a/day1/cheatsheet4.tex	Mon Jan 04 19:54:26 2010 +0530
+++ b/day1/cheatsheet4.tex	Tue Jan 05 15:23:02 2010 +0530
@@ -52,7 +52,7 @@
 In []: C[1,2]
 Out[]: 1
 \end{lstlisting}
-Two indexes seperated by \typ{','} specifies [row, column]. So \typ{C[1,2]} gets third element of second row(indices starts from 0).
+Two indexes separated by \typ{','} specifies [row, column]. So \typ{C[1,2]} gets third element of second row(indices starts from 0).
 \newpage
 \begin{lstlisting}
 In []: C[1]
@@ -123,7 +123,7 @@
 \typ{':2'} => Start from first column, till and excluding third column.
 \newpage
 \subsection{Striding}
-Often apart from submatrix, one needs to get some mechanism to jump a step. For example, how can we have all alternate rows of a Matrix. \\
+Often apart from sub-matrix, one needs to get some mechanism to jump a step. For example, how can we have all alternate rows of a Matrix. \\
 Following method will return Matrix with alternate rows.
 \begin{lstlisting}
 In []: C[::2,:]
--- a/day1/cheatsheet5.tex	Mon Jan 04 19:54:26 2010 +0530
+++ b/day1/cheatsheet5.tex	Tue Jan 05 15:23:02 2010 +0530
@@ -15,7 +15,7 @@
 #load data file directly into Arrays.
 \end{verbatim}
 \section{}
-Interploate
+Interpolate
 \begin{verbatim}
 In []: from scipy.interpolate import splrep
 In []: tck = splrep(x,y) #get spline curve representation for x,y.
--- a/day1/cheatsheet6.tex	Mon Jan 04 19:54:26 2010 +0530
+++ b/day1/cheatsheet6.tex	Tue Jan 05 15:23:02 2010 +0530
@@ -24,7 +24,7 @@
 \large{FOSSEE}
 \end{center}
 \section{Solving linear equations}
-Condier following sets of equations:\\
+Consider following sets of equations:\\
   \begin{align*}
     3x + 2y - z  & = 1 \\
     2x - 2y + 4z  & = -2 \\