Shannon model coding cleanup

Author: Peter Johnson

evaluation_function/dev.json

@@ -20,7 +20,7 @@
     "context_window": 5
   },
   "shannon_words_ngram": {
-    "response": "the general",
+    "response": "the general sweetness",
     "answer": 2,
     "model": "shannon_words_ngram",
     "word_count": 12,

evaluation_function/models/shannon_letters_ngram.py

@@ -90,7 +90,7 @@ def run(response, answer, params:Params) -> Result:
     word_lengths["tokens"] = [row[0] for row in data]
     word_lengths["weights"] = [row[1] for row in data]
     word_count = params.get("word_count", 10)
-    response_used = isinstance(response, int)
+    response_used = isinstance(response, int) and response > 1
     context_window = response if response_used else params.get("context_window", 3)
     if word_count == "random":
         word_count = random.randint(3,15)
@@ -99,6 +99,6 @@ def run(response, answer, params:Params) -> Result:
         output.append(generate_word(k,context_window))
     preface = 'Context window: '+str(context_window)+', Word count: '+str(word_count)+'. Output: <br>'
     feedback_items = [("general", preface + ' '.join(output))]
-    feedback_items.append("| Answer not an integer; used default context window") if not response_used else None
+    feedback_items.append("| Answer not an integer >1; used default context window") if not response_used else None
     is_correct = True
     return Result(is_correct=is_correct,feedback_items=feedback_items)

evaluation_function/models/shannon_words_ngram.py

@@ -55,7 +55,6 @@ def get_counts(n=3):
     if os.path.exists(FILE):
         with open(FILE, "rb") as f:
             cache = pickle.load(f)
-        print(len(cache))
     else:
         cache = {}
     if n not in cache:
@@ -88,9 +87,7 @@ def generate(start="", max_len=20, n=None):
     ctx = tuple((([START]*need) + start_tokens)[-need:]) if need else ()
     out = start_tokens[:]
     for _ in range(max_len):
-        print(f'next; len(counts): {len(counts)}, ctx: {ctx}')
         w = sample_next(counts, ctx)
-        print(f'w = {w}')
         if w in (None, END):
             out.append('#')
             break
@@ -116,5 +113,4 @@ def run(answer, response, params:Params) -> Result:
     feedback_items = [("general", preface + ' '.join(output))]
     feedback_items.append("| Answer not an integer; used default context window") if not response_used else None
     is_correct = True
-    print(feedback_items)
     return Result(is_correct=is_correct,feedback_items=feedback_items)