Merged heads.
--- a/additional_ipython/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/additional_ipython/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -15,9 +15,10 @@
.. 1. Embellishing Plots
.. Author : Nishanth Amuluru
- Internal Reviewer :
+ Internal Reviewer : Amit
External Reviewer :
- Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+ Language Reviewer : Bhanukiran
+ Checklist OK? : <15-11-2010, Anand, OK> [2010-10-05]
Script
------
--- a/embellishing_a_plot/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/embellishing_a_plot/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -16,9 +16,10 @@
.. 1. Using the ``plot`` command interactively
.. Author : Nishanth Amuluru
- Internal Reviewer :
+ Internal Reviewer : Anoop
External Reviewer :
- Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+ Language Reviewe : Bhanukiran
+ Checklist OK? : <15-11-2010, Anand, OK> [2010-10-05]
Script
------
@@ -30,9 +31,9 @@
{{{ Show the slide containing the outline }}}
In this tutorial, we shall look at how to modify the colour, thickness and
-linestyle of the plot. We shall then learn how to add title to the plot and
+linestyle of a plot. We shall then learn how to add title to a plot and
then look at adding labels to x and y axes. we shall also look at adding
-annotations to the plot and setting the limits of axes.
+annotations to the plot and setting the limits on the axes.
Let us start ipython with pylab loaded, by typing on the terminal
@@ -59,14 +60,13 @@
points right?]
As we can see, the default colour and the default thickness of the
-line is as decided by pylab. Wouldn't be nice if we could control
+line is as decided by pylab. Wouldn't it be nice if we could control
these parameters in the plot? This is possible by passing additional
arguments to the plot command.
.. #[[Anoop: I think it will be good to rephrase the sentence]]
.. #[madhu: Why "you" here? Shouldn't this be "we" as decided? Also I
added "the default" check the diff]
-
The additional argument that we shall be passing in here now is the
colour argument. We shall first clear the figure and plot the same in
red colour. Hence
@@ -243,7 +243,9 @@
The solution is to enclose the whole string in between $. Hence,
::
- title("$Parabolic function -x^2+4x-5$")
+ title("Parabolic function $-x^2+4x-5$")
+#[[Bhanu: Dollar sign should enclose only the math-expression. change
+made.]]
gives a title that looks neatly formatted.
--- a/getting-started-sagenotebook/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/getting-started-sagenotebook/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -22,9 +22,10 @@
.. None.
.. Author : Madhu
- Internal Reviewer :
+ Internal Reviewer : Punch
External Reviewer :
- Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+ Language Reviewer : Bhanukiran
+ Checklist OK? : <15-11-2010, Anand, OK> [2010-10-05]
Script
@@ -46,8 +47,8 @@
{{{ Show the slide on what is Sage }}}
To start with, What is Sage? Sage is a free, open-source mathematical
-software. Sage can do a lot of math stuff for you including but not
-limited to algebra, calculus, geometry, cryptography, graph theory
+software. Sage can do a lot of math stuff for you including, but not
+limited to, algebra, calculus, geometry, cryptography, graph theory
among other things. It can also be used as aid in teaching and
research in any of the areas that Sage supports. So let us start Sage
now
@@ -70,10 +71,10 @@
{{{ Show what is displayed on the terminal }}}
So now we can type all the commands that Sage supports here. But Sage
-comes bundled with a much much much more elegant tool called Sage
+comes bundled with a much more elegant tool called Sage
Notebook? What is Sage Notebook? Sage Notebook provides a web based
user interface to use Sage. So once we have a Sage notebook server up
-and running all we want is a browser to access the Sage
+and running, all we want is a browser to access the Sage
functionality. For example there is an official instance of Sage
Notebook server running at http://sagenb.org You can visit that page,
create an account there and start using Sage! So all you need is just
@@ -81,6 +82,8 @@
{{{ Intentional *cough* *cough* }}}
+#[[Bhanu: what? Are you serious?]]
+
to use Sage and nothing else! The Sage notebook also provides a
convenient way of sharing and publishing our work, which is very handy
for research and teaching.
@@ -120,7 +123,7 @@
Once we are logged in with the admin account we can see the notebook
admin page. A notebook can contain a collection of Sage Notebook
-worksheets. Worksheets are basically the working area. This is where
+worksheets. Worksheet is basically a working area. This is where
we enter all the Sage commands on the notebook.
The admin page lists all the worksheets created. On the topmost part
@@ -132,8 +135,8 @@
The home link takes us to the admin home page. The published link
takes us to the page which lists all the published worksheets. The log
link has the complete log of all the actions we did on the
-notebook. We have the settings link where can configure our notebook,
-the notebook server, we can create and mangage accounts. We have a
+notebook. We have the settings link where we can configure our notebook,
+the notebook server, create and mangage accounts. We have a
link to help upon clicking opens a new window with the complete help
of Sage. The entire documentation of Sage is supplied with Sage for
offline reference and this help link is the way to get into it. Then
--- a/getting-started-strings/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/getting-started-strings/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -16,9 +16,10 @@
.. 1. getting started with ipython
.. Author : Madhu
- Internal Reviewer :
+ Internal Reviewer : Punch
External Reviewer :
- Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+ Language Reviewer : Bhanukiran
+ Checklist OK? : <15-11-2010, Anand, OK> [2010-10-05]
Script
------
@@ -31,7 +32,7 @@
{{{ Show the slide containing the outline }}}
In this tutorial, we will look at what we really mean by strings, how
-python supports the use of strings and some of the operations that can
+Python supports the use of strings and some of the operations that can
be performed on strings.
{{{ Shift to terminal and start ipython }}}
@@ -162,9 +163,9 @@
a = 'hello'
a[0] = 'H'
-As said earlier, strings are immutable. We cannot manipulate the
-string. Although there are some methods which let us to manipulate the
-strings. We will look at them in the advanced session on strings. In
+As said earlier, strings are immutable. We cannot manipulate a
+string. Although there are some methods which let us manipulate
+strings, we will look at them in the advanced session on strings. In
addition to the methods that let us manipulate the strings we have
methods like split which lets us break the string on the specified
separator, the join method which lets us combine the list of strings
--- a/getting-started-with-lists/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/getting-started-with-lists/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -22,7 +22,8 @@
.. Author : Amit
Internal Reviewer : Anoop Jacob Thomas <anoop@fossee.in>
External Reviewer :
- Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+ Language Reviewer : Bhanukiran
+ Checklist OK? : <12-11-2010, Anand, OK> [2010-10-05]
.. #[[Anoop: Slides contain only outline and summary
@@ -44,9 +45,9 @@
* Append elements to lists
* Delete elements from lists
-List is a compound data type, it can contain data of other data
-types. List is also a sequence data type, all the elements are in
-order and the order has a meaning.
+List is a compound data type, it can contain data of mutually
+different datatypes. List is also a sequence data type, all the
+elements are arranged in a given order.
.. #[[Anoop: "all the elements are in order and **there** order has a
meaning." - I guess something is wrong here, I am not able to
@@ -69,13 +70,13 @@
nonempty = ['spam', 'eggs', 100, 1.234]
Thus the simplest way of creating a list is typing out a sequence
-of comma-separated values (items) between square brackets.
-All the list items need not be of the same data type.
+of comma-separated values (or items) between two square brackets.
As we can see lists can contain different kinds of data. In the
-previous example 'spam' and 'eggs' are strings and 100 and 1.234 are
-integer and float. Thus we can put elements of heterogenous types in
-lists including list itself.
+previous example 'spam' and 'eggs' are strings whereas 100 and 1.234 are
+integer and float respectively. Thus we can put elements of different types in
+lists including lists itself. This property makes lists heterogeneous
+data structures.
.. #[[Anoop: the sentence "Thus list themselves can be one of the
element types possible in lists" is not clear, rephrase it.]]
@@ -84,9 +85,10 @@
listinlist=[[4,2,3,4],'and', 1, 2, 3, 4]
-We access list elements using the index. The index begins from 0. So
-for list nonempty, nonempty[0] gives the first element, nonempty[1]
-the second element and so on and nonempty[3] the last element. ::
+We access an element of a list using its corresponding index. Index of
+the first element of a list is 0. So for the list nonempty, nonempty[0]
+gives the first element, nonempty[1] the second element and so on and
+nonempty[3] the last element. ::
nonempty[0]
nonempty[1]
@@ -112,9 +114,9 @@
nonempty[-4]
-1 gives the last element which is the 4th element , -2 second to last
-and -4 gives the fourth from last element which is first element.
+and -4 gives the fourth from the last which, in this case, is the first element.
-We can append elements to the end of a list using append command. ::
+We can append elements to the end of a list using the method append. ::
nonempty.append('onemore')
nonempty
@@ -134,10 +136,10 @@
The solution is on your screen
-As we can see non empty appends 'onemore' and 6 at the end.
+As we can see nonempty is appended with 'onemore' and 6 at the end.
Using len function we can check the number of elements in the list
-nonempty. In this case it 6 ::
+nonempty. In this case it is 6 ::
len(nonempty)
@@ -175,11 +177,12 @@
nonempty
If we check now we will see that the first occurence 'spam' is removed
-thus remove removes the first occurence of the element in the sequence
+and therefore `remove` removes the first occurence of the element in the sequence
and leaves others untouched.
-One should remember this that while del removes by index number.
-Remove , removes on the basis of content being passed so if ::
+One should remember this that while del removes by index number,
+`remove` removes on the basis of content being passed on. For instance
+if ::
k = [1,2,1,3]
del([k[2])
--- a/getting-started-with-symbolics/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/getting-started-with-symbolics/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -20,7 +20,8 @@
.. Author : Amit
Internal Reviewer :
External Reviewer :
- Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+ Language Reviewer : Bhanukiran
+ Checklist OK? : <, if OK> [2010-10-05]
Symbolics with Sage
-------------------
@@ -40,11 +41,11 @@
* Defining symbolic functions.
* Simplifying and solving symbolic expressions and functions.
-Amongst a lot of other things, Sage can do Symbolic Math and we shall
+In addtion to a lot of other things, Sage can do Symbolic Math and we shall
start with defining symbolic expressions in Sage.
-Hope you have your Sage notebook open. If not, pause the video and
-start you Sage notebook.
+Have your Sage notebook opened. If not, pause the video and
+start you Sage notebook right now.
On the sage notebook type::
@@ -63,7 +64,7 @@
Sage simply returns the expression.
Sage treats ``sin(y)`` as a symbolic expression. We can use this to do
-symbolic maths using Sage's built-in constants and expressions.
+symbolic math using Sage's built-in constants and expressions.
Let us try out a few examples. ::
@@ -286,7 +287,7 @@
as we can see when we substitute the value the answer is almost = 0 showing
the solution we got was correct.
-Following is an (are) exercise(s) that you must do.
+Following are a few exercises that you must do.
%% %% Differentiate the following.
--- a/input_output/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/input_output/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -14,7 +14,8 @@
.. Author : Nishanth Amuluru
Internal Reviewer : Puneeth
External Reviewer :
- Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+ Language Reviewer : Bhanukiran
+ Checklist OK? : <put date stamp here, not OK> [2010-10-05]
Script
------
--- a/lstsq/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/lstsq/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -11,9 +11,10 @@
.. 3. Loading data from files
.. Author : Nishanth Amuluru
- Internal Reviewer :
+ Internal Reviewer : Punch
External Reviewer :
- Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+ Language Reviewer : Bhanukiran
+ Checklist OK? : <put date stamp here, not OK> [2010-10-05]
.. #[Puneeth: Add pre-requisites.]
--- a/manipulating-lists/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/manipulating-lists/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -11,9 +11,10 @@
.. 3.
.. Author : Madhu
- Internal Reviewer :
+ Internal Reviewer : Punch
External Reviewer :
- Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+ Language Reviewer : Bhanukiran
+ Checklist OK? : <16-11-2010, Anand, OK> [2010-10-05]
Script
------
@@ -24,10 +25,10 @@
{{{ Show the slide containing the outline }}}
-We have already learnt a lot about Lists in Python. In this tutorial,
-we will learn more about advanced features of Lists in Python. We will
-see how to concatenate two lists, details of slicing and striding of
-lists, methods to sort and reverse lists.
+We have already learnt about Lists in Python. In this tutorial,
+we will learn about more advanced features of Lists in Python like how
+to concatenate two lists, details of slicing and striding of lists,
+methods to sort and reverse lists.
{{{ Shift to terminal and start ipython }}}
@@ -49,16 +50,16 @@
primes = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29]
-To obtain the all the primes between 10 and 20 from the above list of
+To obtain all the primes between 10 and 20 from the above list of
primes we say::
primes[4:8]
This gives us all the elements in the list starting from the element
-with the index 4 which is 11 in our list upto the element with index 8
+with the index 4, which is 11 in our list, upto the element with index 8
in the list but not including the eigth element. So we obtain a slice
starting from 11 upto 19th. It is a very important to remember that
-when ever we specify a range of elements in Python the start index is
+whenever we specify a range of elements in Python the start index is
included and end index is not included. So in the above case, 11 which
was the element with the index 4 was included but 23 which was the
element with index 8 was excluded.
@@ -129,7 +130,7 @@
gives us all the multiples of 3 from the list, since every third
element in it, starting from 0, is divisible by 3.
-The other basic operation that we can perform on list is concatenation
+The other basic operation that we can perform on lists is concatenation
of two or more lists. We can combine two lists by using the "plus"
operator. Say we have
@@ -160,7 +161,7 @@
a
[1, 5, 6, 7, 7, 10]
-Since the sort method sorts the list inplace the original list we had
+As the sort method sorts the elements of a list, the original list we had
is overwritten or replaced. We have no way to obtain the original list
back. One way to avoid this is to keep a copy of the original list in
another variable and run the sort method on the list. However Python
@@ -174,8 +175,7 @@
sa = sorted(a)
-Similarly to perform certain operations on the list we would like to
-reverse the list. Python provides reverse method which again reverses
+Python also provides the reverse method which reverses
the list inplace::
a = [1, 2, 3, 4, 5]
--- a/multiple-plots/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/multiple-plots/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -20,6 +20,9 @@
Internal Reviewer 1 : [potential reviewer: Puneeth]
Internal Reviewer 2 : Nishanth
External Reviewer :
+ Language Reviewer : Bhanukiran
+ Checklist OK? : <, not OK> []
+
Script
------
@@ -205,7 +208,7 @@
{{{ Have both plot window and ipython side by side }}}
-We also titled the our first plot as 'sin(y)' which we did not do for
+We also titled our first plot as 'sin(y)' which we did not do for
the second plot.
Let us attempt another exercise problem
@@ -264,7 +267,7 @@
{{{ Have both plot window and ipython side by side }}}
-in this case we have 2 so it spilts the plotting area horizontally for
+in this case we have 2 as the first argument so it spilts the plotting area horizontally for
two subplots. The second argument specifies the number of coloumns of
subplots that must be created. We passed 1 as the argument so the
plotting area won't be split vertically and the last argument
--- a/parsing_data/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/parsing_data/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -13,9 +13,10 @@
.. 1. Getting started with lists
.. Author : Nishanth Amuluru
- Internal Reviewer :
+ Internal Reviewer : Amit
External Reviewer :
- Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+ Language Reviewer : Bhanukiran
+ Checklist OK? : <put date stamp here, not OK> [2010-10-05]
Script
------
@@ -37,7 +38,7 @@
#[Puneeth]: I don't like the way the term "parsing data" has been used, all
through the script. See if that can be changed.
- Lets us have a look at the problem
+ Let us have a look at the problem
{{{ Show the slide containing problem statement. }}}
@@ -48,9 +49,9 @@
As you can see, each record consists of fields seperated by a ";". The first
record is region code, then roll number, then name, marks of second language,
first language, maths, science and social, total marks, pass/fail indicatd by P
-or F and finally W if with held and empty otherwise.
+or F and finally W if withheld and empty otherwise.
-Our job is to calculate the mean of all the maths marks in the region "B".
+Our job is to calculate the arithmetic mean of all the maths marks in the region "B".
#[Nishanth]: Please note that I am not telling anything about AA since they do
not know about any if/else yet.
@@ -143,7 +144,7 @@
white space. The only road block we now have is conversion of string to float.
The splitting and stripping operations are done on a string and their result is
-also a string. hence the marks that we have are still strings and mathematical
+also a string. Hence the marks that we have are still strings and mathematical
operations are not possible on them. We must convert them into numbers
(integers or floats), before we can perform mathematical operations on them.
--- a/sets/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/sets/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -15,9 +15,10 @@
.. 1. Getting started with lists
.. Author : Nishanth Amuluru
- Internal Reviewer :
+ Internal Reviewer : Punch
External Reviewer :
- Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+ Language Reviewer : Bhanukiran
+ Checklist OK? : <15-11-2010, Anand, OK> [2010-10-05]
Script
------
--- a/tuples/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/tuples/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -13,9 +13,10 @@
.. 1. Getting started with lists
.. Author : Nishanth Amuluru
- Internal Reviewer :
+ Internal Reviewer : Punch
External Reviewer :
- Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+ Language Reviewer : Bhanukiran
+ Checklist OK? : <put date stamp here, not OK> [2010-10-05]
Script
------
--- a/using_sage_to_teach/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/using_sage_to_teach/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -14,7 +14,8 @@
.. Author : Nishanth Amuluru
Internal Reviewer :
External Reviewer :
- Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+ Language Reviewer : Bhanukiran
+ Checklist OK? : <put date stamp here, not OK> [2010-10-05]
Script
------
--- a/writing_python_scripts/script.rst Fri Nov 12 15:23:54 2010 +0530
+++ b/writing_python_scripts/script.rst Wed Nov 17 17:30:10 2010 +0530
@@ -12,9 +12,10 @@
.. 1. Using Python modules
.. Author : Nishanth Amuluru
- Internal Reviewer :
+ Internal Reviewer : Punch
External Reviewer :
- Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+ Language Reviewer : Bhanukiran
+ Checklist OK? : <15-11-2010, Anand, OK> [2010-10-05]
Script
------
@@ -46,7 +47,7 @@
return a
-We shall write an test function in the script that tests the gcd function every
+We shall write a test function in the script that tests the gcd function every
time the script is run.
{{{ Add to the script }}}