Merge lp:open-leaderboard-app/1.1 into lp:open-leaderboard-app

[James-Robert Corken Knight]

Merge with 1.1

Add Basic Statistics and bad input detection.

[James-Robert Corken Knight (nexxusdrako)]

review: Approve

=== added file 'LICENSE.txt'
--- LICENSE.txt	1970-01-01 00:00:00 +0000
+++ LICENSE.txt	2013-03-21 02:51:21 +0000
@@ -0,0 +1,8 @@
+Copyright (c) 2013 James-Robert Corken Knight
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

=== modified file 'openleaderboardapp.py'
--- openleaderboardapp.py	2013-03-21 01:00:49 +0000
+++ openleaderboardapp.py	2013-03-21 02:51:21 +0000
@@ -1,17 +1,40 @@
 leaderboard = {}
 import cPickle as pickle
-import sys
-
+
+def average(values):
+    """ Return the average of the values in the list. """
+    return sum(values) / float(len(values))
+
+def standardDeviation(values):
+    """ Computer the standard deviation of the values in
+        the list.
+    """
+    mean = average(values)
+
+    differences = [(value - mean)**2 for value in values]
+
+    return average(differences) ** 0.5
+    
 def askScore():
+	""" Asks the user for a score. """
 	scorer = raw_input("What is the scorer's name? ")
 	scorer = scorer + ": "
-	score = float(raw_input("How much did they score? "))
-	addScore(scorer, score)
+	score = raw_input("How much did they score? ")
+	if score.isdigit():
+		score = float(score)
+		if score != 0:
+			addScore(scorer, score)
+		else:
+			print "Zero doesn't warrant a leaderboard entry, sorry about that."
+	else:
+		print "Invalid score input."
 	
 def addScore(scorer, score):
+	""" Adds the user's score. """
 	leaderboard[scorer] = score
 	
 def printLeaderboard():
+	""" Displays the leaderboard """
 	for key, v in sorted(leaderboard.iteritems(), key=lambda item: -item[1]):
 		for key in leaderboard:
 			if leaderboard[ key ] == v:
@@ -19,13 +42,28 @@
 				break
 				
 def saveLeaderboard():
+	""" Saves the leaderboard """
 	f = open("leaderboard.ola", "wb")
 	pickle.dump(leaderboard, f)
 	f.close()
+	
+def getAverage():
+	""" Gets the average """
+	avg = 0
+	avg = average(valuesList)
+	return avg
 
+def getStandardDeviation():
+	stdDev = 0
+	stdDev = standardDeviation(valuesList)
+	return stdDev
+	
 choice = 0
-while choice != "6":
-	choice = str(raw_input("1. Add Score\n2. Show Leaderboard\n3. Save Leaderboard\n4. Load Leaderboard\n5. Delete Leaderboard\n6. Quit\nEnter choice: "))
+
+# Main menu
+while choice != "7":
+	valuesList = leaderboard.values()
+	choice = str(raw_input("1. Add Score\n2. Show Leaderboard\n3. Save Leaderboard\n4. Load Leaderboard\n5. Delete Leaderboard\n6. Show Statistics\n7. Quit\nEnter choice: "))
 	if choice == "1":
 		askScore()
 		continue
@@ -43,6 +81,8 @@
 		leaderboard = {}
 		saveLeaderboard()
 	elif choice == "6":
+		print "Average:" + str(getAverage()) + "\nStandard Deviation:" + str(getStandardDeviation())
+	elif choice == "7":
 		print "See you soon!"
 	else:
 		print "Sorry, I couldn't understand you."