Merge pull request #11 from darius/master

Code golf rewrite and testing tweak

04-code-golf/tf-04-pn.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # My golf score is slightly lower!  
 # Best wishes, Peter Norvig
 

04-code-golf/tf-04.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python
-import re, string, sys
+import heapq, re, sys
 
-stops = set(open("../stop_words.txt").read().split(",") + list(string.ascii_lowercase))
-words = [x.lower() for x in re.split("[^a-zA-Z]+", open(sys.argv[1]).read()) if len(x) > 0 and x.lower() not in stops]
-unique_words = list(set(words))
-unique_words.sort(lambda x, y: cmp(words.count(y), words.count(x)))
-print "\n".join(["%s - %s" % (x, words.count(x)) for x in unique_words[:25]])
+words = re.findall("[a-z]{2,}", open(sys.argv[1]).read().lower())
+for w in heapq.nlargest(25, set(words) - set(open("../stop_words.txt").read().split(",")), words.count):
+    print w, "-", words.count(w)