# HG changeset patch
# User Puneeth Chaganti <punchagan@gmail.com>
# Date 1288164353 -19800
# Node ID 35fc94bf76736820f4499c91f6b93a4021a2652b
# Parent  284170f2c12ef266ed8bfa9a8a9a265999d213bb# Parent  68ec23cfef499d23ed5a1ae0370a4d342e42af7e
Merged Heads.

diff -r 284170f2c12e -r 35fc94bf7673 progress.org
diff -r 284170f2c12e -r 35fc94bf7673 statistics/questions.rst
--- a/statistics/questions.rst	Wed Oct 27 12:54:41 2010 +0530
+++ b/statistics/questions.rst	Wed Oct 27 12:55:53 2010 +0530
@@ -8,15 +8,13 @@
    sum
 
 2. Calcutate the mean of the given list?
-   
    student_marks=[74,78,56,87,91,82]
    
    mean(student_marks) 
 
 
-3. Given a two dimensional list,::
+3. Given a two dimensional list,
    two_dimensional_list=[[3,5,8,2,1],[4,3,6,2,1]]
-   
    how do we calculate the mean  of each row?
    
 
@@ -27,7 +25,6 @@
    std
 
 5. Calcutate the median of the given list?
-   
    student_marks=[74,78,56,87,91,82]
 
    median(age_list)
@@ -50,5 +47,10 @@
 
 .. A minimum of 2 questions here (along with answers)
 
-1. Question 1
-2. Question 2
+1. Get the weighted mean of [74,64,86,76,83] where the weights are 
+   [2,2,1,4,4] respectively.
+
+   Hint: Readup on function average using average?
+
+2. Calculate the weighted standard deviation for the sequence [74,64,86,76,83], such that the weights are [2,2,1,4,4] .
+ 
diff -r 284170f2c12e -r 35fc94bf7673 statistics/script.rst
--- a/statistics/script.rst	Wed Oct 27 12:54:41 2010 +0530
+++ b/statistics/script.rst	Wed Oct 27 12:55:53 2010 +0530
@@ -105,7 +105,7 @@
 * Roll Number 015163
 * Name JOSEPH RAJ S
 * Marks of 5 subjects: ** English 083 ** Hindi 042 ** Maths 47 **
-Science AA (Absent) ** Social 72
+Science 35 ** Social 72
 * Total marks 244
 *
 
@@ -165,8 +165,9 @@
 This tutorial was created as a part of FOSSEE project, NME ICT, MHRD India
 
 Hope you have enjoyed and found it useful.
+
 Thankyou
- 
+
 .. Author              : Amit Sethi
    Internal Reviewer 1 : 
    Internal Reviewer 2 :