projects
/
cas-master-teacher-training.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finished the text
[cas-master-teacher-training.git]
/
hangman
/
hangman.py
diff --git
a/hangman/hangman.py
b/hangman/hangman.py
index 1eac3a55a6db4ae9f9ebfe7ed26d624340aac9f0..f9a634c658ce7404b0d92d9c0391126ef0940a9d 100644
(file)
--- a/
hangman/hangman.py
+++ b/
hangman/hangman.py
@@
-9,7
+9,7
@@
WORDS = [w.strip() for w in open('/usr/share/dict/british-english').readlines()
LETTER_COUNTS = collections.Counter(l.lower() for l in open('../sherlock-holmes.txt').read() if l in string.ascii_letters)
LETTERS_IN_ORDER = [p[0] for p in LETTER_COUNTS.most_common()]
LETTER_COUNTS = collections.Counter(l.lower() for l in open('../sherlock-holmes.txt').read() if l in string.ascii_letters)
LETTERS_IN_ORDER = [p[0] for p in LETTER_COUNTS.most_common()]
-DICT_COUNTS = collections.Counter(
l.lower() for l in open('/usr/share/dict/british-english').read() if l in string.ascii_letters
)
+DICT_COUNTS = collections.Counter(
''.join(WORDS)
)
DICT_LETTERS_IN_ORDER = [p[0] for p in DICT_COUNTS.most_common()]
STARTING_LIVES = 10
DICT_LETTERS_IN_ORDER = [p[0] for p in DICT_COUNTS.most_common()]
STARTING_LIVES = 10
@@
-79,8
+79,7
@@
class PlayerFixedOrder:
self.ordered_letters = ordered_letters
def guess(self, discovered, missed, lives):
self.ordered_letters = ordered_letters
def guess(self, discovered, missed, lives):
- guessed_letters = [l.lower() for l in discovered + missed if l in string.ascii_letters]
- return [l for l in self.ordered_letters if l not in guessed_letters][0]
+ return [l for l in self.ordered_letters if l not in discovered + missed][0]
class PlayerAlphabetical(PlayerFixedOrder):
def __init__(self):
class PlayerAlphabetical(PlayerFixedOrder):
def __init__(self):
@@
-106,8
+105,7
@@
class PlayerAdaptive:
def guess(self, discovered, missed, lives):
self.filter_candidate_words(discovered, missed)
self.set_ordered_letters()
def guess(self, discovered, missed, lives):
self.filter_candidate_words(discovered, missed)
self.set_ordered_letters()
- guessed_letters = [l.lower() for l in discovered + missed if l in string.ascii_letters]
- return [l for l in self.ordered_letters if l not in guessed_letters][0]
+ return [l for l in self.ordered_letters if l not in discovered + missed][0]
def filter_candidate_words(self, discovered, missed):
pass
def filter_candidate_words(self, discovered, missed):
pass