progress on special challenges

Author: domino14

djAerolith/lib/domain.py

@@ -70,6 +70,9 @@ def append(self, question):
     def extend(self, questions):
         self.questions.extend(questions.questions)
 
+    def truncate(self, n):
+        self.questions = self.questions[:n]
+
     def size(self):
         return len(self.questions)
 

djAerolith/wordwalls/challenges.py

@@ -19,14 +19,6 @@
 
 logger = logging.getLogger(__name__)
 
-# try:
-#     COMMON_SHORT_NAMED_LIST = NamedList.objects.get(
-#           name=FRIENDLY_COMMON_SHORT)
-#     COMMON_LONG_NAMED_LIST = NamedList.objects.get(name=FRIENDLY_COMMON_LONG)
-# except NamedList.DoesNotExist:
-#     COMMON_SHORT_NAMED_LIST = None
-#     COMMON_LONG_NAMED_LIST = None
-
 
 def generate_dc_questions(challenge_name, lex, challenge_date):
     """

djAerolith/wordwalls/special_challenges.py

@@ -1,8 +1,11 @@
+import logging
 import random
 
-from lib.word_db_helper import WordDB
 from lib.domain import Questions
+from lib.word_db_helper import WordDB, word_search
+from lib.word_searches import SearchDescription
 
+logger = logging.getLogger(__name__)
 HIGH_PROB_CUTOFF = 5000
 MED_PROB_CUTOFF = 10000
 
@@ -31,16 +34,34 @@ def get_alphagrams_for_challenge(lex, challenge_name):
     given the challenge name.
 
     """
+    # try:
+    #     COMMON_SHORT_NAMED_LIST = NamedList.objects.get(
+    #         name=FRIENDLY_COMMON_SHORT)
+    #     COMMON_LONG_NAMED_LIST = NamedList.objects.get(name=FRIENDLY_COMMON_LONG)
+    # except NamedList.DoesNotExist:
+    #     COMMON_SHORT_NAMED_LIST = None
+    #     COMMON_LONG_NAMED_LIST = None
+
     db = WordDB(lex.lexiconName)
-    if challenge_name == SpecialChallengeTypes.HIGH_PROB_BINGOS:
-        return get_by_prob(db, [7, 8], [1, HIGH_PROB_CUTOFF])
-    elif challenge_name == SpecialChallengeTypes.HIGH_PROB_7s:
-        return get_by_prob(db, [7], [1, HIGH_PROB_CUTOFF])
-    elif challenge_name == SpecialChallengeTypes.HIGH_PROB_8s:
-        return get_by_prob(db, [8], [1, HIGH_PROB_CUTOFF])
-    elif challenge_name == SpecialChallengeTypes.MED_PROB_BINGOS:
-        return get_by_prob(db, [7, 8], [HIGH_PROB_CUTOFF + 1,
-                                        MED_PROB_CUTOFF])
+    func_table = {
+        SpecialChallengeTypes.HIGH_PROB_BINGOS: lambda: get_by_prob(
+            db, [7, 8], [1, HIGH_PROB_CUTOFF]),
+        SpecialChallengeTypes.HIGH_PROB_7s: lambda: get_by_prob(
+            db, [7], [1, HIGH_PROB_CUTOFF]),
+        SpecialChallengeTypes.HIGH_PROB_8s: lambda: get_by_prob(
+            db, [8], [1, HIGH_PROB_CUTOFF]),
+        SpecialChallengeTypes.MED_PROB_BINGOS: lambda: get_by_prob(
+            db, [7, 8], [HIGH_PROB_CUTOFF + 1, MED_PROB_CUTOFF]),
+        # SpecialChallengeTypes.COMMON_WORDS_SHORT: lambda:
+        # SpecialChallengeTypes.COMMON_WORDS_LONG: lambda:
+        SpecialChallengeTypes.HIGH_VOWEL_BINGOS: lambda: get_by_vowels(
+            lex, [7, 8], [4, 5]),
+        SpecialChallengeTypes.JQXZ_SHORT_WORDS: lambda: get_by_jqxz(
+            lex, [5, 6]),
+    }
+
+    fn = func_table[challenge_name]
+    return fn()
 
 
 def get_by_prob(db, lengths, probs):
@@ -51,10 +72,51 @@ def get_by_prob(db, lengths, probs):
     """
     questions = Questions()
     for lg in lengths:
-        probs = list(range(probs[0], probs[1] + 1))
-        random.shuffle(probs)
+        prob_list = list(range(probs[0], probs[1] + 1))
+        random.shuffle(prob_list)
+        num_qs = int(50 / len(lengths))
+        qs = db.get_questions_for_probability_list(prob_list[:num_qs], lg)
+        questions.extend(qs)
+
+    return questions
+
+
+def get_by_vowels(lex, lengths, vowels):
+    """
+    get_by_vowels returns 50 alphagrams.
+
+    Half of them have length lengths[0] and vowels vowels[0]+
+    Half of them have length lengths[1] and vowels vowels[1]+
+
+    """
+    questions = Questions()
+    for idx, lg in enumerate(lengths):
+        qs = word_search([
+            SearchDescription.lexicon(lex),
+            SearchDescription.length(lg, lg),
+            SearchDescription.number_vowels(vowels[idx], lg),
+        ])
+
+        qs.shuffle()
+        num_qs = int(50 / len(lengths))
+        qs.truncate(num_qs)
+        questions.extend(qs)
+
+    return questions
+
+
+def get_by_jqxz(lex, lengths):
+    questions = Questions()
+    for idx, lg in enumerate(lengths):
+        qs = word_search([
+            SearchDescription.lexicon(lex),
+            SearchDescription.length(lg, lg),
+            SearchDescription.matching_anagram('[JQXZ]+' + '?' * (lg - 1)),
+        ])
+
+        qs.shuffle()
         num_qs = int(50 / len(lengths))
-        qs = db.get_questions_for_probability_list(probs[:num_qs], lg)
+        qs.truncate(num_qs)
         questions.extend(qs)
 
     return questions

djAerolith/wordwalls/tests/test_special_challenges.py

@@ -1,11 +1,17 @@
+import re
+
 from django.test import TestCase
 
+from base.models import Lexicon
 from lib.word_db_helper import WordDB
-from wordwalls.special_challenges import get_by_prob
+from wordwalls.special_challenges import get_by_prob, get_by_vowels
 
 
 class SpecialChallengeTest(TestCase):
+    fixtures = ['test/lexica.json']
+
     def setUp(self):
+        self.lex = Lexicon.objects.get(lexiconName='America')
         self.db = WordDB(lexicon_name='America')
 
     def test_get_by_prob(self):
@@ -18,4 +24,18 @@ def test_get_by_prob(self):
             assert (len(q.alphagram.alphagram) >= 7 and
                     len(q.alphagram.alphagram) <= 8)
             alphas.add(q.alphagram.alphagram)
-        assert(len(alphas) == 50)
+        assert(len(alphas) == 50)
+
+    def test_get_by_vowels(self):
+        qs = get_by_vowels(self.lex, [7, 8], [4, 5])
+        assert len(qs) == 50
+        alphas = set()
+        for q in qs.questions_array():
+            assert (len(q.alphagram.alphagram) >= 7 and
+                    len(q.alphagram.alphagram) <= 8)
+            if len(q.alphagram.alphagram) == 7:
+                assert len(re.findall('[AEIOU]{1}', q.alphagram.alphagram)) >= 4  # noqa
+            if len(q.alphagram.alphagram) == 8:
+                assert len(re.findall('[AEIOU]{1}', q.alphagram.alphagram)) >= 5  # noqa
+            alphas.add(q.alphagram.alphagram)
+        assert(len(alphas) == 50)