summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessing-pieces-arrays/script.rst21
-rw-r--r--advanced-features-functions/script.rst80
-rw-r--r--getting-started-files/pendulum.txt90
-rw-r--r--getting-started-files/script.rst81
-rw-r--r--getting-started-ipython/script.rst51
-rw-r--r--loading-data-from-files/pendulum.txt90
-rw-r--r--loading-data-from-files/pendulum_semicolon.txt90
-rw-r--r--loading-data-from-files/primes.txt25
-rw-r--r--loading-data-from-files/script.rst66
9 files changed, 503 insertions, 91 deletions
diff --git a/accessing-pieces-arrays/script.rst b/accessing-pieces-arrays/script.rst
index b0974af..2731e0d 100644
--- a/accessing-pieces-arrays/script.rst
+++ b/accessing-pieces-arrays/script.rst
@@ -1,22 +1,21 @@
.. Objectives
.. ----------
- By the end of this tutorial, you will be able to:
+ .. By the end of this tutorial, you will be able to:
- 1. Access and change individual elements of arrays, both one
- dimensional and multi-dimensional.
- 2. Access and change rows and columns of arrays.
- 3. Access and change other chunks from an array, using slicing
- and striding.
- 4. Read images into arrays and perform processing on them, using
- simple array manipulations.
+ .. 1. Access and change individual elements of arrays, both one
+ .. dimensional and multi-dimensional.
+ .. 2. Access and change rows and columns of arrays.
+ .. 3. Access and change other chunks from an array, using slicing
+ .. and striding.
+ .. 4. Read images into arrays and perform processing on them, using
+ .. simple array manipulations.
.. Prerequisites
.. -------------
-.. 1. Name of LO-1
-.. 2. Name of LO-2
-.. 3. Name of LO-3
+.. 1. getting started with arrays
+
.. Author : Puneeth
Internal Reviewer :
diff --git a/advanced-features-functions/script.rst b/advanced-features-functions/script.rst
index 9ed8dc5..e62d576 100644
--- a/advanced-features-functions/script.rst
+++ b/advanced-features-functions/script.rst
@@ -1,17 +1,40 @@
-========
- Script
-========
+.. Objectives
+.. ----------
-{{{ show the welcome slide }}}
+.. At the end of this tutorial, you will be able to
+
+.. 1. Assign default values to arguments, when defining functions
+.. 2. Define and call functions with keyword arguments.
+.. 3. Also, you will get a glimpse of the plethora of functions
+.. available, in Python standard library and the scientific computing
+.. libraries.
+
+
+.. Prerequisites
+.. -------------
+
+.. 1. getting started with ipython
+.. #. getting started with functions
+
+.. Author : Puneeth
+ Internal Reviewer :
+ External Reviewer :
+ Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+
+Script
+------
+
+{{{ Show the slide containing title }}}
Welcome to the tutorial on advanced feature of functions.
-{{{ show the outline slide }}}
+{{{ Show the outline slide }}}
In this tutorial we shall be looking at specifying default arguments
to functions when defining them and calling functions using keyword
arguments. We shall also, look at some of the built-in functions
-available in the standard library of Python.
+available in the standard library of Python and the scientific
+computing libraries.
{{{ switch to terminal }}}
@@ -46,7 +69,7 @@ being 0. 0 is the default value of the argument.
linspace(0, 2*pi, 100) # returns 100 points between 0 and 2pi
linspace(0, 2*pi) # returns 50 points between 0 and 2pi
-#[punch: all above content goes on to a slide]
+.. #[punch: all above content goes on to a slide]
{{{ switch back to ipython }}}
@@ -76,10 +99,13 @@ Now let us call the function with just one argument "Hello".
"Hello" is treated as the ``greet`` and we get "Hello World" as
the output. "World" is the default value for the argument ``name``.
-E%% %% Pause the video here and redefine the function ``welcome``, by
-interchanging it's arguments. Place the ``name`` argument with it's
-default value of "Hello" before the ``greet`` argument. Then, resume
-the video.
+Following is an (are) exercise(s) that you must do.
+
+%%1%% Redefine the function ``welcome``, by interchanging it's
+arguments. Place the ``name`` argument with it's default value of
+"Hello" before the ``greet`` argument.
+
+Please, pause the video here. Do the exercise and then continue.
::
@@ -90,17 +116,24 @@ We get an error that reads ``SyntaxError: non-default argument follows
default argument``. When defining a function all the argument with
default values should come at the end.
-E%% %% Pause the video here and type ``linspace?`` to see the
-definition of the command and notice how all the arguments with
-default values are towards the end.
+Following is an exercise that you must do.
+
+%%2%% See the definition of linspace using ``?`` and observe how all
+the arguments with default values are towards the end.
+
+Please, pause the video here. Do the exercise and then continue.
::
linspace?
-E%% %% Pause the video here and redefine the function ``welcome`` with
-a default value of "Hello" to the ``greet`` argument. Then, call the
-function without any arguments. Then, resume the video.
+Following is an exercise that you must do.
+
+%%3%% Redefine the function ``welcome`` with a default value of
+"Hello" to the ``greet`` argument. Then, call the function without any
+arguments.
+
+Please, pause the video here. Do the exercise and then continue.
::
@@ -175,8 +208,8 @@ with it.
Math functions - abs, sin, ....
-#[punch: Need to decide, exactly what to put here. Reviewer comments
- welcome.]
+.. #[punch: Need to decide, exactly what to put here. Reviewer comments
+.. welcome.]
{{{ switch to slide showing classes of functions in pylab, scipy }}}
@@ -192,7 +225,7 @@ purposes.
scipy (modules)
fftpack, stats, linalg, ndimage, signal, optimize, integrate
-{{{ switch slide to summary slide }}}
+{{{ Show summary slide }}}
That brings us to the end of this tutorial. In this tutorial we have
learnt how to use functions with default values and keyword
@@ -200,4 +233,9 @@ arguments. We also looked at the range of functions available in the
Python standard library and the Scientific Computing related
packages.
-Thank You!
+{{{ Show the "sponsored by FOSSEE" slide }}}
+
+This tutorial was created as a part of FOSSEE project, NME ICT, MHRD India
+
+Hope you have enjoyed and found it useful.
+Thank you!
diff --git a/getting-started-files/pendulum.txt b/getting-started-files/pendulum.txt
new file mode 100644
index 0000000..7e07566
--- /dev/null
+++ b/getting-started-files/pendulum.txt
@@ -0,0 +1,90 @@
+1.0000e-01 6.9004e-01
+1.1000e-01 6.9497e-01
+1.2000e-01 7.4252e-01
+1.3000e-01 7.5360e-01
+1.4000e-01 8.3568e-01
+1.5000e-01 8.6789e-01
+1.6000e-01 8.4182e-01
+1.7000e-01 8.5379e-01
+1.8000e-01 8.5762e-01
+1.9000e-01 8.8390e-01
+2.0000e-01 8.9985e-01
+2.1000e-01 9.8436e-01
+2.2000e-01 1.0244e+00
+2.3000e-01 1.0572e+00
+2.4000e-01 9.9077e-01
+2.5000e-01 1.0058e+00
+2.6000e-01 1.0727e+00
+2.7000e-01 1.0943e+00
+2.8000e-01 1.1432e+00
+2.9000e-01 1.1045e+00
+3.0000e-01 1.1867e+00
+3.1000e-01 1.1385e+00
+3.2000e-01 1.2245e+00
+3.3000e-01 1.2406e+00
+3.4000e-01 1.2071e+00
+3.5000e-01 1.2658e+00
+3.6000e-01 1.2995e+00
+3.7000e-01 1.3142e+00
+3.8000e-01 1.2663e+00
+3.9000e-01 1.2578e+00
+4.0000e-01 1.2991e+00
+4.1000e-01 1.3058e+00
+4.2000e-01 1.3478e+00
+4.3000e-01 1.3506e+00
+4.4000e-01 1.4044e+00
+4.5000e-01 1.3948e+00
+4.6000e-01 1.3800e+00
+4.7000e-01 1.4480e+00
+4.8000e-01 1.4168e+00
+4.9000e-01 1.4719e+00
+5.0000e-01 1.4656e+00
+5.1000e-01 1.4399e+00
+5.2000e-01 1.5174e+00
+5.3000e-01 1.4988e+00
+5.4000e-01 1.4751e+00
+5.5000e-01 1.5326e+00
+5.6000e-01 1.5297e+00
+5.7000e-01 1.5372e+00
+5.8000e-01 1.6094e+00
+5.9000e-01 1.6352e+00
+6.0000e-01 1.5843e+00
+6.1000e-01 1.6643e+00
+6.2000e-01 1.5987e+00
+6.3000e-01 1.6585e+00
+6.4000e-01 1.6317e+00
+6.5000e-01 1.7074e+00
+6.6000e-01 1.6654e+00
+6.7000e-01 1.6551e+00
+6.8000e-01 1.6964e+00
+6.9000e-01 1.7143e+00
+7.0000e-01 1.7706e+00
+7.1000e-01 1.7622e+00
+7.2000e-01 1.7260e+00
+7.3000e-01 1.8089e+00
+7.4000e-01 1.7905e+00
+7.5000e-01 1.7428e+00
+7.6000e-01 1.8381e+00
+7.7000e-01 1.8182e+00
+7.8000e-01 1.7865e+00
+7.9000e-01 1.7995e+00
+8.0000e-01 1.8296e+00
+8.1000e-01 1.8625e+00
+8.2000e-01 1.8623e+00
+8.3000e-01 1.8383e+00
+8.4000e-01 1.8593e+00
+8.5000e-01 1.8944e+00
+8.6000e-01 1.9598e+00
+8.7000e-01 1.9000e+00
+8.8000e-01 1.9244e+00
+8.9000e-01 1.9397e+00
+9.0000e-01 1.9440e+00
+9.1000e-01 1.9718e+00
+9.2000e-01 1.9383e+00
+9.3000e-01 1.9555e+00
+9.4000e-01 2.0006e+00
+9.5000e-01 1.9841e+00
+9.6000e-01 2.0066e+00
+9.7000e-01 2.0493e+00
+9.8000e-01 2.0503e+00
+9.9000e-01 2.0214e+00
diff --git a/getting-started-files/script.rst b/getting-started-files/script.rst
index e090406..5c21dcc 100644
--- a/getting-started-files/script.rst
+++ b/getting-started-files/script.rst
@@ -1,10 +1,30 @@
-========
- Script
-========
+.. Objectives
+.. ----------
-Welcome to the tutorial on getting started with files.
+.. By the end of this tutorial, you will be able to
+.. 1. Open and read the contents of a file.
+.. #. Read files line by line.
+.. #. Read all the contents of the file at once.
+.. #. Close open files.
-{{{ Screen shows welcome slide }}}
+.. Prerequisites
+.. -------------
+
+.. 1. getting started with ipython
+.. #. getting started with lists
+.. #. getting started with for
+
+.. Author : Puneeth
+ Internal Reviewer :
+ External Reviewer :
+ Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+
+Script
+------
+
+{{{ Show the slide containing title }}}
+
+Hello Friends. Welcome to the tutorial on getting started with files.
{{{ Show the outline for this tutorial }}}
@@ -33,7 +53,8 @@ see what it is.
f
The file object shows, the file which is open and the mode (read
-or write) in which it is open.
+or write) in which it is open. Notice that it is open in read only
+mode, here.
We shall first learn to read the whole file into a single
variable. Later, we shall look at reading it line-by-line. We use
@@ -54,24 +75,29 @@ to see more explicitly, what it contains.
pend
-%%1%% Pause the video here and split the variable into a list,
-``pend_list``, of the lines in the file and then resume the
-video. Hint, use the tab command to see what methods the string
-variable has.
+Following is an exercise that you must do.
+
+%%1%% Split the variable into a list, ``pend_list``, of the lines in
+the file. Hint, use the tab command to see what methods the string
+variable has.
+
+Please, pause the video here. Do the exercise and then continue.
+
+.. #[punch: should this even be put? add dependency to strings LO,
+.. where we mention that strings have methods for manipulation. hint:
+.. use splitlines()]
-#[punch: should this even be put? add dependency to strings LO,
-where we mention that strings have methods for manipulation. hint:
-use splitlines()]
::
pend_list = pend.splitlines()
pend_list
-Now, let us learn to read the file line-by-line. But, before that
-we will have to close the file, since the file has already been
-read till the end.
-#[punch: should we mention file-pointer?]
+Now, let us learn to read the file line-by-line. But, before that we
+will have to close the file, since the file has already been read till
+the end.
+
+.. #[punch: should we mention file-pointer?]
Let us close the file opened into f.
::
@@ -89,8 +115,11 @@ opened, after their job is done.
Let us, now move on to reading files line-by-line.
-%%1%% Pause the video here and re-open the file ``pendulum.txt``
-with ``f`` as the file object, and then resume the video.
+Following is an exercise that you must do.
+
+%%2%% Re-open the file ``pendulum.txt`` with ``f`` as the file object.
+
+Please, pause the video here. Do the exercise and then continue.
We just use the up arrow until we reach the open command and issue
it again.
@@ -123,8 +152,10 @@ file object ``f`` and directly open the file within the for
statement. This will save us the trouble of closing the file, each
time we open it.
-for line in open('/home/fossee/pendulum.txt'):
-line_list.append(line)
+::
+
+ for line in open('/home/fossee/pendulum.txt'):
+ line_list.append(line)
Let us see what ``line_list`` contains.
::
@@ -143,5 +174,11 @@ have learnt to open and close files, read the data in the files as
a whole, using the read command or reading it line by line by
iterating over the file object.
-Thank you!
+{{{ Show the "sponsored by FOSSEE" slide }}}
+
+This tutorial was created as a part of FOSSEE project, NME ICT, MHRD India
+
+Hope you have enjoyed and found it useful.
+Thank you!
+
diff --git a/getting-started-ipython/script.rst b/getting-started-ipython/script.rst
index 42b62cb..e2f280a 100644
--- a/getting-started-ipython/script.rst
+++ b/getting-started-ipython/script.rst
@@ -1,14 +1,19 @@
.. Objectives
.. ----------
-.. Clearly state the objectives of the LO (along with RBT level)
+.. At the end of this tutorial, you will be able to
+
+.. 1. invoke the ``ipython`` interpreter.
+.. #. quit the ``ipython`` interpreter.
+.. #. navigate in the history of ``ipython``.
+.. #. use tab-completion.
+.. #. look-up documentation of functions.
+.. #. interrupt incomplete or incorrect commands.
.. Prerequisites
.. -------------
-.. 1. Name of LO-1
-.. 2. Name of LO-2
-.. 3. Name of LO-3
+.. should have ``ipython`` and ``pylab`` installed.
.. Author : Puneeth
Internal Reviewer :
@@ -24,14 +29,14 @@ Script
Hello Friends and Welcome to the tutorial on getting started with
``ipython``.
-{{{ Show slide with outline of the session. }}}
+{{{ Show slide with outline }}}
This tutorial will cover the basic usage of the ``ipython``
interpreter. The following topics would be covered.
IPython is an enhanced Python interpreter that provides features like
-tabcompletion, easier access to help and many other functionalities
-which are not available in the vannila Python interpreter.
+tabcompletion, easier access to help and lot of other functionality
+which are not available in the vanilla Python interpreter.
First let us see how to invoke the ``ipython`` interpreter.
@@ -98,8 +103,12 @@ Now, we remove all the characters and just type ``r`` and then hit
tab. IPython does not complete the command since there are many
possibilities. It just lists out all the possible completions.
-%% %% Pause the video here and type ``ab`` and hit tab to see what
-happens. Next, jut type ``a`` and hit tab to see what happens.
+Following is an exercise that you must do.
+
+%%1%% Type ``ab`` and hit tab to see what happens. Next, jut type
+``a`` and hit tab to see what happens.
+
+Please, pause the video here. Do the exercise and then continue.
``ab`` tab completes to ``abs`` and ``a<tab>`` gives us a list of all
the commands starting with a.
@@ -125,11 +134,11 @@ We get 19, as expected, in both the cases.
Does it work for decimals (or floats)? Let's try typing abs(-10.5)
and we do get back 10.5.
-Following is an (are) exercise(s) that you must do.
+Following is an exercise that you must do.
-%%1%% Look-up the documentation of ``round`` and see how to use it.
+%%2%% Look-up the documentation of ``round`` and see how to use it.
-Please, pause the video here. Do the exercises and then continue.
+Please, pause the video here. Do the exercise and then continue.
::
@@ -142,17 +151,20 @@ documentation.
The function ``round``, rounds a number to a given precision.
-%% %% Pause the video here and check the output of
-round(2.48)
-round(2.48, 1)
-round(2.48, 2)
-and then resume the video.
+Following are exercises that you must do.
+
+%%3%% Check the output of::
+
+ round(2.48)
+ round(2.48, 1)
+ round(2.48, 2)
-::
round(2.484)
round(2.484, 1)
round(2.484, 2)
+Please, pause the video here. Do the exercises and then continue.
+
We get 2.0, 2.5 and 2.48, which are what we expect.
Let's now see how to correct typing errors that we make when typing at
@@ -174,7 +186,7 @@ prompt.
Following is an exercise that you must do.
-%%2%% Try typing round(2.484, and hit enter. and then cancel the
+%%4%% Try typing round(2.484, and hit enter. and then cancel the
command using Ctrl-C. Then, type the command, round(2.484, 2) and
resume the video.
@@ -193,7 +205,6 @@ This brings us to the end of the tutorial on getting started with
In this tutorial we have learnt
{{{ show the outline/summary slide. }}}
-
{{{ Show the "sponsored by FOSSEE" slide }}}
This tutorial was created as a part of FOSSEE project, NME ICT, MHRD India
diff --git a/loading-data-from-files/pendulum.txt b/loading-data-from-files/pendulum.txt
new file mode 100644
index 0000000..7e07566
--- /dev/null
+++ b/loading-data-from-files/pendulum.txt
@@ -0,0 +1,90 @@
+1.0000e-01 6.9004e-01
+1.1000e-01 6.9497e-01
+1.2000e-01 7.4252e-01
+1.3000e-01 7.5360e-01
+1.4000e-01 8.3568e-01
+1.5000e-01 8.6789e-01
+1.6000e-01 8.4182e-01
+1.7000e-01 8.5379e-01
+1.8000e-01 8.5762e-01
+1.9000e-01 8.8390e-01
+2.0000e-01 8.9985e-01
+2.1000e-01 9.8436e-01
+2.2000e-01 1.0244e+00
+2.3000e-01 1.0572e+00
+2.4000e-01 9.9077e-01
+2.5000e-01 1.0058e+00
+2.6000e-01 1.0727e+00
+2.7000e-01 1.0943e+00
+2.8000e-01 1.1432e+00
+2.9000e-01 1.1045e+00
+3.0000e-01 1.1867e+00
+3.1000e-01 1.1385e+00
+3.2000e-01 1.2245e+00
+3.3000e-01 1.2406e+00
+3.4000e-01 1.2071e+00
+3.5000e-01 1.2658e+00
+3.6000e-01 1.2995e+00
+3.7000e-01 1.3142e+00
+3.8000e-01 1.2663e+00
+3.9000e-01 1.2578e+00
+4.0000e-01 1.2991e+00
+4.1000e-01 1.3058e+00
+4.2000e-01 1.3478e+00
+4.3000e-01 1.3506e+00
+4.4000e-01 1.4044e+00
+4.5000e-01 1.3948e+00
+4.6000e-01 1.3800e+00
+4.7000e-01 1.4480e+00
+4.8000e-01 1.4168e+00
+4.9000e-01 1.4719e+00
+5.0000e-01 1.4656e+00
+5.1000e-01 1.4399e+00
+5.2000e-01 1.5174e+00
+5.3000e-01 1.4988e+00
+5.4000e-01 1.4751e+00
+5.5000e-01 1.5326e+00
+5.6000e-01 1.5297e+00
+5.7000e-01 1.5372e+00
+5.8000e-01 1.6094e+00
+5.9000e-01 1.6352e+00
+6.0000e-01 1.5843e+00
+6.1000e-01 1.6643e+00
+6.2000e-01 1.5987e+00
+6.3000e-01 1.6585e+00
+6.4000e-01 1.6317e+00
+6.5000e-01 1.7074e+00
+6.6000e-01 1.6654e+00
+6.7000e-01 1.6551e+00
+6.8000e-01 1.6964e+00
+6.9000e-01 1.7143e+00
+7.0000e-01 1.7706e+00
+7.1000e-01 1.7622e+00
+7.2000e-01 1.7260e+00
+7.3000e-01 1.8089e+00
+7.4000e-01 1.7905e+00
+7.5000e-01 1.7428e+00
+7.6000e-01 1.8381e+00
+7.7000e-01 1.8182e+00
+7.8000e-01 1.7865e+00
+7.9000e-01 1.7995e+00
+8.0000e-01 1.8296e+00
+8.1000e-01 1.8625e+00
+8.2000e-01 1.8623e+00
+8.3000e-01 1.8383e+00
+8.4000e-01 1.8593e+00
+8.5000e-01 1.8944e+00
+8.6000e-01 1.9598e+00
+8.7000e-01 1.9000e+00
+8.8000e-01 1.9244e+00
+8.9000e-01 1.9397e+00
+9.0000e-01 1.9440e+00
+9.1000e-01 1.9718e+00
+9.2000e-01 1.9383e+00
+9.3000e-01 1.9555e+00
+9.4000e-01 2.0006e+00
+9.5000e-01 1.9841e+00
+9.6000e-01 2.0066e+00
+9.7000e-01 2.0493e+00
+9.8000e-01 2.0503e+00
+9.9000e-01 2.0214e+00
diff --git a/loading-data-from-files/pendulum_semicolon.txt b/loading-data-from-files/pendulum_semicolon.txt
new file mode 100644
index 0000000..409867a
--- /dev/null
+++ b/loading-data-from-files/pendulum_semicolon.txt
@@ -0,0 +1,90 @@
+1.0000e-01;6.9004e-01
+1.1000e-01;6.9497e-01
+1.2000e-01;7.4252e-01
+1.3000e-01;7.5360e-01
+1.4000e-01;8.3568e-01
+1.5000e-01;8.6789e-01
+1.6000e-01;8.4182e-01
+1.7000e-01;8.5379e-01
+1.8000e-01;8.5762e-01
+1.9000e-01;8.8390e-01
+2.0000e-01;8.9985e-01
+2.1000e-01;9.8436e-01
+2.2000e-01;1.0244e+00
+2.3000e-01;1.0572e+00
+2.4000e-01;9.9077e-01
+2.5000e-01;1.0058e+00
+2.6000e-01;1.0727e+00
+2.7000e-01;1.0943e+00
+2.8000e-01;1.1432e+00
+2.9000e-01;1.1045e+00
+3.0000e-01;1.1867e+00
+3.1000e-01;1.1385e+00
+3.2000e-01;1.2245e+00
+3.3000e-01;1.2406e+00
+3.4000e-01;1.2071e+00
+3.5000e-01;1.2658e+00
+3.6000e-01;1.2995e+00
+3.7000e-01;1.3142e+00
+3.8000e-01;1.2663e+00
+3.9000e-01;1.2578e+00
+4.0000e-01;1.2991e+00
+4.1000e-01;1.3058e+00
+4.2000e-01;1.3478e+00
+4.3000e-01;1.3506e+00
+4.4000e-01;1.4044e+00
+4.5000e-01;1.3948e+00
+4.6000e-01;1.3800e+00
+4.7000e-01;1.4480e+00
+4.8000e-01;1.4168e+00
+4.9000e-01;1.4719e+00
+5.0000e-01;1.4656e+00
+5.1000e-01;1.4399e+00
+5.2000e-01;1.5174e+00
+5.3000e-01;1.4988e+00
+5.4000e-01;1.4751e+00
+5.5000e-01;1.5326e+00
+5.6000e-01;1.5297e+00
+5.7000e-01;1.5372e+00
+5.8000e-01;1.6094e+00
+5.9000e-01;1.6352e+00
+6.0000e-01;1.5843e+00
+6.1000e-01;1.6643e+00
+6.2000e-01;1.5987e+00
+6.3000e-01;1.6585e+00
+6.4000e-01;1.6317e+00
+6.5000e-01;1.7074e+00
+6.6000e-01;1.6654e+00
+6.7000e-01;1.6551e+00
+6.8000e-01;1.6964e+00
+6.9000e-01;1.7143e+00
+7.0000e-01;1.7706e+00
+7.1000e-01;1.7622e+00
+7.2000e-01;1.7260e+00
+7.3000e-01;1.8089e+00
+7.4000e-01;1.7905e+00
+7.5000e-01;1.7428e+00
+7.6000e-01;1.8381e+00
+7.7000e-01;1.8182e+00
+7.8000e-01;1.7865e+00
+7.9000e-01;1.7995e+00
+8.0000e-01;1.8296e+00
+8.1000e-01;1.8625e+00
+8.2000e-01;1.8623e+00
+8.3000e-01;1.8383e+00
+8.4000e-01;1.8593e+00
+8.5000e-01;1.8944e+00
+8.6000e-01;1.9598e+00
+8.7000e-01;1.9000e+00
+8.8000e-01;1.9244e+00
+8.9000e-01;1.9397e+00
+9.0000e-01;1.9440e+00
+9.1000e-01;1.9718e+00
+9.2000e-01;1.9383e+00
+9.3000e-01;1.9555e+00
+9.4000e-01;2.0006e+00
+9.5000e-01;1.9841e+00
+9.6000e-01;2.0066e+00
+9.7000e-01;2.0493e+00
+9.8000e-01;2.0503e+00
+9.9000e-01;2.0214e+00
diff --git a/loading-data-from-files/primes.txt b/loading-data-from-files/primes.txt
new file mode 100644
index 0000000..384d511
--- /dev/null
+++ b/loading-data-from-files/primes.txt
@@ -0,0 +1,25 @@
+2
+3
+5
+7
+11
+13
+17
+19
+23
+29
+31
+37
+41
+43
+47
+53
+59
+61
+67
+71
+73
+79
+83
+89
+97
diff --git a/loading-data-from-files/script.rst b/loading-data-from-files/script.rst
index f67a8c3..ff4ce19 100644
--- a/loading-data-from-files/script.rst
+++ b/loading-data-from-files/script.rst
@@ -1,8 +1,30 @@
-========
- Script
-========
+.. Objectives
+.. ----------
-Welcome to this tutorial on loading data from files.
+.. At the end of this tutorial, you will be able to
+
+.. + Read data from files, containing a single column of data using the
+.. ``loadtxt`` command.
+.. + Read multiple columns of data, separated by spaces or other
+.. delimiters.
+
+
+.. Prerequisites
+.. -------------
+
+.. 1. getting started with ``ipython``
+
+.. Author :
+ Internal Reviewer :
+ External Reviewer :
+ Checklist OK? : <put date stamp here, if OK> [2010-10-05]
+
+Script
+------
+
+{{{ Show the slide containing title }}}
+
+Hello Friends. Welcome to this tutorial on loading data from files.
{{{ Screen shows welcome slide }}}
@@ -59,15 +81,19 @@ about them, later.
Now, let us use the ``loadtxt`` command to read a file that contains
two columns of data, ``pendulum.txt``. This file contains the length
of the pendulum in the first column and the corresponding time period
-in the second.
+in the second. Note that ``loadtxt`` needs both the columns to have
+equal number of rows.
-%%1%% Pause the video here, and use the ``cat`` command to view the
-contents of this file and then resume the video.
+.. Following is an exercise that you must do.
-This is how we look at the contents of the file, ``pendulum.txt``
-::
+.. %%1%% Use the ``cat`` command to view the contents of this file.
+
+.. Please, pause the video here. Do the exercise and then continue.
+
+.. This is how we look at the contents of the file, ``pendulum.txt``
+.. ::
- cat /home/fossee/pendulum.txt
+.. cat /home/fossee/pendulum.txt
.. #[Nishanth]: The first column is L values and second is T values
from a simle pelculum experiment.
@@ -114,13 +140,14 @@ separate sequences instead of one complex sequence.
In this tutorial, we have learnt the basic use of the ``loadtxt``
command, which is capable of doing a lot more than we have used it for
-until now, for example
+until now. Let us look at an example, but before that do this
+exercise.
-%%2%% Pause the video here, and read the file
-``pendulum_semicolon.txt`` which contains the same data as
-``pendulum.txt``, but the columns are separated by semi-colons instead
-of spaces. Use the IPython help to see how to do this. Once you have
-finished, resume the video to look at the solution.
+%%1%% Read the file ``pendulum_semicolon.txt`` which contains the same
+data as ``pendulum.txt``, but the columns are separated by semi-colons
+instead of spaces. Use the IPython help to see how to do this.
+
+Please, pause the video here. Do the exercise and then continue.
{{{ switch back to the terminal }}}
::
@@ -142,5 +169,10 @@ You should now be able to do the following, comfortably.
+ Read multiple columns of data, separated by spaces or other
delimiters.
-Thank you!
+{{{ Show the "sponsored by FOSSEE" slide }}}
+
+This tutorial was created as a part of FOSSEE project, NME ICT, MHRD India
+
+Hope you have enjoyed and found it useful.
+Thank you!