diff options
| -rw-r--r-- | advanced-features-functions/script.rst | 12 | ||||
| -rw-r--r-- | input_output/script.rst | 29 | ||||
| -rw-r--r-- | loops/script.rst | 22 | ||||
| -rw-r--r-- | using-plot-interactively/buttons.png (renamed from plotui/buttons.png) | bin | 5214 -> 5214 bytes | |||
| -rw-r--r-- | using-plot-interactively/move.png (renamed from plotui/move.png) | bin | 606 -> 606 bytes | |||
| -rw-r--r-- | using-plot-interactively/quickref.tex (renamed from plotui/quickref.tex) | 0 | ||||
| -rw-r--r-- | using-plot-interactively/save.png (renamed from plotui/save.png) | bin | 676 -> 676 bytes | |||
| -rw-r--r-- | using-plot-interactively/script.rst (renamed from plotui/script.rst) | 0 | ||||
| -rw-r--r-- | using-plot-interactively/slides.tex (renamed from plotui/slides.tex) | 0 | ||||
| -rw-r--r-- | using-plot-interactively/zoom.png (renamed from plotui/zoom.png) | bin | 947 -> 947 bytes | |||
| -rw-r--r-- | using-sage/script.rst | 12 |
11 files changed, 30 insertions, 45 deletions
diff --git a/advanced-features-functions/script.rst b/advanced-features-functions/script.rst index 0abae54..6e49c44 100644 --- a/advanced-features-functions/script.rst +++ b/advanced-features-functions/script.rst @@ -169,7 +169,8 @@ Please, pause the video here. Do the exercise and then continue. welcome() -Let us now learn what keyword arguments are. +Let us now learn what keyword arguments or named arguments are. We +shall refer to them as keyword arguments, henceforth. {{{ show a slide with examples using keyword arguments. }}} @@ -185,14 +186,6 @@ Let us now learn what keyword arguments are. pie(science.values(), labels = science.keys()) -.. #[[Anoop: I think it will better to introduce keyword arguments as - keyword/named arguments, as the keyword term was quite confusing - for me, so can be for someone who already know certain - jargon's/concepts, also it would be good to tell them that these - are different from keywords in programming languages, explicit is - better than implicit, and probably you could also tell them that - from now on we will refer to it as just keyword arguments]] - When you are calling functions in Python, you don't need to remember the order in which to pass the arguments. Instead, you can use the name of the argument to pass it a value. This slide shows a few @@ -249,7 +242,6 @@ with it. .. #[punch: Need to decide, exactly what to put here. Reviewer comments .. welcome.] - {{{ switch to slide showing classes of functions in pylab, scipy }}} .. #[[Anoop: slide missing]] diff --git a/input_output/script.rst b/input_output/script.rst index bcac6e9..799ff17 100644 --- a/input_output/script.rst +++ b/input_output/script.rst @@ -12,7 +12,7 @@ .. 1. Loops .. Author : Nishanth Amuluru - Internal Reviewer : + Internal Reviewer : Puneeth External Reviewer : Checklist OK? : <put date stamp here, if OK> [2010-10-05] @@ -26,10 +26,10 @@ Hello friends and welcome to the tutorial on Input/Output {{{ Show the slide containing the outline slide }}} Input and Output are used in almost every program we use. -In this tutorial, we shall learn +In this tutorial, we shall learn how to - * Outputting data - * Taking input from the user + * Output data + * Take input from the user type :: @@ -38,7 +38,7 @@ type a print a -print a prints the value of a which is obvious. +``print a``, obviously, is printing the value of ``a``. As you can see, even when you type just a, the value of a is shown. But there is a difference. @@ -57,10 +57,12 @@ While typing print b prints the string and hence the newline. Moreover when we type just a, the value a is shown only in interactive mode and does not have any effect on the program while running it as a script. +.. #[punch: I think we could show that?] + We shall look at different ways of outputting the data. -print statement also accepts the syntax of C's printf statement. -Various arguments can be passed to print using modifiers. +``print`` statement also accepts the syntax of C's ``printf`` statement. +Various arguments can be passed to ``print`` using modifiers. type :: @@ -69,7 +71,8 @@ type z = "zed" print "x is %2.1f y is %d z is %s"%(x,y) -As you can see, the values of x and y are substituted in place of %2.1f and %d +As you can see, the values of x and y are substituted in place of +``%2.1f`` and ``%d`` {{{ Pause here and try out the following exercises }}} @@ -77,12 +80,12 @@ As you can see, the values of x and y are substituted in place of %2.1f and %d {{{ continue from paused state }}} -We see that the int value of x and float value of y are printed corresponding -to the modifiers used in the print statement. +We see that the ``int`` value of x and ``float`` value of y are +printed corresponding to the modifiers used in the print statement. -We can also see that print statement prints a new line character at the end of -line, everytime it is called. This can be suppressed by using a "," at the end -print statement. +We can also see that ``print`` statement prints a new line character +at the end of the line, everytime it is called. This can be suppressed +by using a "," at the end ``print`` statement. Let us see this by typing out following code on an editor as print_example.py diff --git a/loops/script.rst b/loops/script.rst index 2957e25..5204596 100644 --- a/loops/script.rst +++ b/loops/script.rst @@ -31,15 +31,14 @@ Hello Friends. Welcome to the tutorial on loops in Python. {{{ Show the outline slide }}} In this tutorial, we shall look at ``while`` and ``for`` loops. We -shall then look at the ``break``, ``continue`` and ``pass`` keywords -and how to use them. +shall then look at how to break out of them, or skip some iterations +in loops. .. #[[Anoop: for loop is a pre-requisite and has been already covered, so i think our emphasize can be on while loops]] -.. #[[Anoop: Instead of saying we will learn keywords pass, break and - continue, I think it is better to tell them that we will learn more - about loops]] +.. #[[punch: I think, we should have both of them. It gives a better +.. context and comparison.] {{{ switch to the ipython terminal }}} @@ -144,8 +143,8 @@ iteration and continue to the end of this iteration. .. #[[Anoop: should add slides for break, continue, pass]] Say, we wish to print the squares of all the odd numbers below 10, -which are not multiples of 3, we would modify the for loop as follows. -:: +which are not multiples of 3, we would modify the ``for`` loop as +follows. :: for n in range(1, 10, 2): if n%3 == 0: @@ -157,12 +156,9 @@ Following is an exercise that you must do. {{{ switch to next slide }}} -%%3%%Using the ``continue`` keyword modify the ``for`` loop to print -the squares of even numbers below 10, to print the squares of only -multiples of 4. (Do not modify the range function call.) - -.. #[[Anoop: can you be more explicit/specific on do no modify say we - can ask them to use range(2, 10, 2) and solve the problem]] +%%3%%Using the ``continue`` keyword modify the ``for`` loop, with the +``range(2, 10, 2)``, to print the squares of even numbers below 10, to +print the squares of only multiples of 4. Please, pause the video here. Do the exercise and then continue. diff --git a/plotui/buttons.png b/using-plot-interactively/buttons.png Binary files differindex 7b39d24..7b39d24 100644 --- a/plotui/buttons.png +++ b/using-plot-interactively/buttons.png diff --git a/plotui/move.png b/using-plot-interactively/move.png Binary files differindex 538ed1f..538ed1f 100644 --- a/plotui/move.png +++ b/using-plot-interactively/move.png diff --git a/plotui/quickref.tex b/using-plot-interactively/quickref.tex index 6f0451f..6f0451f 100644 --- a/plotui/quickref.tex +++ b/using-plot-interactively/quickref.tex diff --git a/plotui/save.png b/using-plot-interactively/save.png Binary files differindex b1a6757..b1a6757 100644 --- a/plotui/save.png +++ b/using-plot-interactively/save.png diff --git a/plotui/script.rst b/using-plot-interactively/script.rst index 21af31b..21af31b 100644 --- a/plotui/script.rst +++ b/using-plot-interactively/script.rst diff --git a/plotui/slides.tex b/using-plot-interactively/slides.tex index 6999f43..6999f43 100644 --- a/plotui/slides.tex +++ b/using-plot-interactively/slides.tex diff --git a/plotui/zoom.png b/using-plot-interactively/zoom.png Binary files differindex c1a7fdf..c1a7fdf 100644 --- a/plotui/zoom.png +++ b/using-plot-interactively/zoom.png diff --git a/using-sage/script.rst b/using-sage/script.rst index 21c6af2..e32ac0d 100644 --- a/using-sage/script.rst +++ b/using-sage/script.rst @@ -28,12 +28,8 @@ Hello Friends. Welcome to this tutorial on using Sage. {{{ show the slide with outline }}} -In this tutorial we shall quickly look at a few examples of the areas -(name the areas, here) in which Sage can be used and how it can be -used. - -.. #[[Anoop: add name of areas and further introduction if needed for - a smooth switch]] +In this tutorial we shall quickly look at a few examples of using Sage +for Linear Algebra, Calculus, Graph Theory and Number theory. {{{ show the slide with Calculus outline }}} @@ -62,9 +58,7 @@ the positive side. To find the limit from the negative side, we say, :: - lim(1/x, x=0, dir='above') - -.. #[[Anoop: both the above codes are going the same thing isn't it?]] + lim(1/x, x=0, dir='below') Let us now see how to differentiate, using Sage. We shall find the differential of the expression ``exp(sin(x^2))/x`` w.r.t ``x``. We |
