From d29fed213caccc7bf2f66ed7a11b94b4bbcac3d1 Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Thu, 6 Oct 2016 14:40:16 +0200
Subject: Python: add support for auxiliary code (like for Prolog)

---
 python/problems/functions_and_modules/all/common.py               | 8 ++++----
 python/problems/functions_and_modules/any/common.py               | 8 ++++----
 python/problems/functions_and_modules/caesar_cipher/common.py     | 8 ++++----
 python/problems/functions_and_modules/dominoes/common.py          | 8 ++++----
 python/problems/functions_and_modules/largest_sublist/common.py   | 8 ++++----
 python/problems/functions_and_modules/lists_sum/common.py         | 8 ++++----
 python/problems/functions_and_modules/longest_word/common.py      | 8 ++++----
 python/problems/functions_and_modules/map/common.py               | 8 ++++----
 .../problems/functions_and_modules/multiplicative_range/common.py | 8 ++++----
 python/problems/functions_and_modules/similarity/common.py        | 8 ++++----
 python/problems/functions_and_modules/suspicious_words/common.py  | 8 ++++----
 11 files changed, 44 insertions(+), 44 deletions(-)

(limited to 'python/problems/functions_and_modules')

diff --git a/python/problems/functions_and_modules/all/common.py b/python/problems/functions_and_modules/all/common.py
index 6df5597..68428ba 100644
--- a/python/problems/functions_and_modules/all/common.py
+++ b/python/problems/functions_and_modules/all/common.py
@@ -19,7 +19,7 @@ hint_type = {
     'final_hint': Hint('final_hint')
 }
 
-def test(python, code):
+def test(python, code, aux_code=''):
     func_name = 'all'
     tokens = get_tokens(code)
     if not has_token_sequence(tokens, ['def', func_name]):
@@ -41,7 +41,7 @@ def test(python, code):
     test_in = [(func_name+'(%s)'%str(l[0]), None) for l in in_out]
     test_out = [l[1] for l in in_out]
 
-    answers = python(code=code, inputs=test_in, timeout=1.0)
+    answers = python(code=aux_code+code, inputs=test_in, timeout=1.0)
     n_correct = 0
     tin, tout = None, None
     for i, (ans, to) in enumerate(zip(answers, test_out)):
@@ -59,11 +59,11 @@ def test(python, code):
     return passed, hints
 
 
-def hint(python, code):
+def hint(python, code, aux_code=''):
     tokens = get_tokens(code)
 
     # run one test first to see if there are any exceptions
-    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    answer = python(code=aux_code+code, inputs=[(None, None)], timeout=1.0)
     exc = get_exception_desc(answer[0][3])
     if exc: return exc
 
diff --git a/python/problems/functions_and_modules/any/common.py b/python/problems/functions_and_modules/any/common.py
index 3834c8a..ee38613 100644
--- a/python/problems/functions_and_modules/any/common.py
+++ b/python/problems/functions_and_modules/any/common.py
@@ -19,7 +19,7 @@ hint_type = {
     'final_hint': Hint('final_hint')
 }
 
-def test(python, code):
+def test(python, code, aux_code=''):
     func_name = 'any'
     tokens = get_tokens(code)
     if not has_token_sequence(tokens, ['def', func_name]):
@@ -39,7 +39,7 @@ def test(python, code):
     test_in = [(func_name+'(%s)'%str(l[0]), None) for l in in_out]
     test_out = [l[1] for l in in_out]
 
-    answers = python(code=code, inputs=test_in, timeout=1.0)
+    answers = python(code=aux_code+code, inputs=test_in, timeout=1.0)
     n_correct = 0
     tin, tout = None, None
     for i, (ans, to) in enumerate(zip(answers, test_out)):
@@ -57,11 +57,11 @@ def test(python, code):
     return passed, hints
 
 
-def hint(python, code):
+def hint(python, code, aux_code=''):
     tokens = get_tokens(code)
 
     # run one test first to see if there are any exceptions
-    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    answer = python(code=aux_code+code, inputs=[(None, None)], timeout=1.0)
     exc = get_exception_desc(answer[0][3])
     if exc: return exc
 
diff --git a/python/problems/functions_and_modules/caesar_cipher/common.py b/python/problems/functions_and_modules/caesar_cipher/common.py
index b85c847..976c83c 100644
--- a/python/problems/functions_and_modules/caesar_cipher/common.py
+++ b/python/problems/functions_and_modules/caesar_cipher/common.py
@@ -24,7 +24,7 @@ hint_type = {
     'final_hint': Hint('final_hint')
 }
 
-def test(python, code):
+def test(python, code, aux_code=''):
     func_name = 'caesar'
     tokens = get_tokens(code)
     if not has_token_sequence(tokens, ['def', func_name]):
@@ -48,7 +48,7 @@ def test(python, code):
     test_in = [(func_name+'("%s")'%str(l[0]), None) for l in in_out]
     test_out = [l[1] for l in in_out]
 
-    answers = python(code=code, inputs=test_in, timeout=1.0)
+    answers = python(code=aux_code+code, inputs=test_in, timeout=1.0)
     n_correct = 0
     tin, tout = None, None
     for i, (ans, to) in enumerate(zip(answers, test_out)):
@@ -66,11 +66,11 @@ def test(python, code):
     return passed, hints
 
 
-def hint(python, code):
+def hint(python, code, aux_code=''):
     tokens = get_tokens(code)
 
     # run one test first to see if there are any exceptions
-    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    answer = python(code=aux_code+code, inputs=[(None, None)], timeout=1.0)
     exc = get_exception_desc(answer[0][3])
     if exc: return exc
 
diff --git a/python/problems/functions_and_modules/dominoes/common.py b/python/problems/functions_and_modules/dominoes/common.py
index eb5d8e8..283452d 100644
--- a/python/problems/functions_and_modules/dominoes/common.py
+++ b/python/problems/functions_and_modules/dominoes/common.py
@@ -19,7 +19,7 @@ hint_type = {
     'final_hint': Hint('final_hint')
 }
 
-def test(python, code):
+def test(python, code, aux_code=''):
     func_name = 'dominoes'
     tokens = get_tokens(code)
     if not has_token_sequence(tokens, ['def', func_name]):
@@ -38,7 +38,7 @@ def test(python, code):
     test_in = [(func_name+'(%s)'%str(l[0]), None) for l in in_out]
     test_out = [l[1] for l in in_out]
 
-    answers = python(code=code, inputs=test_in, timeout=1.0)
+    answers = python(code=aux_code+code, inputs=test_in, timeout=1.0)
     n_correct = 0
     tin, tout = None, None
     for i, (ans, to) in enumerate(zip(answers, test_out)):
@@ -56,11 +56,11 @@ def test(python, code):
     return passed, hints
 
 
-def hint(python, code):
+def hint(python, code, aux_code=''):
     tokens = get_tokens(code)
 
     # run one test first to see if there are any exceptions
-    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    answer = python(code=aux_code+code, inputs=[(None, None)], timeout=1.0)
     exc = get_exception_desc(answer[0][3])
     if exc: return exc
 
diff --git a/python/problems/functions_and_modules/largest_sublist/common.py b/python/problems/functions_and_modules/largest_sublist/common.py
index 44a661d..dfa33dd 100644
--- a/python/problems/functions_and_modules/largest_sublist/common.py
+++ b/python/problems/functions_and_modules/largest_sublist/common.py
@@ -25,7 +25,7 @@ hint_type = {
     'final_hint': Hint('final_hint')
 }
 
-def test(python, code):
+def test(python, code, aux_code=''):
     func_name = 'largest_sublist'
     tokens = get_tokens(code)
     if not has_token_sequence(tokens, ['def', func_name]):
@@ -42,7 +42,7 @@ def test(python, code):
     test_in = [(func_name+'(%s)'%str(l[0]), None) for l in in_out]
     test_out = [l[1] for l in in_out]
 
-    answers = python(code=code, inputs=test_in, timeout=1.0)
+    answers = python(code=aux_code+code, inputs=test_in, timeout=1.0)
     n_correct = 0
     tin, tout = None, None
     for i, (ans, to) in enumerate(zip(answers, test_out)):
@@ -60,11 +60,11 @@ def test(python, code):
     return passed, hints
 
 
-def hint(python, code):
+def hint(python, code, aux_code=''):
     tokens = get_tokens(code)
 
     # run one test first to see if there are any exceptions
-    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    answer = python(code=aux_code+code, inputs=[(None, None)], timeout=1.0)
     exc = get_exception_desc(answer[0][3])
     if exc: return exc
 
diff --git a/python/problems/functions_and_modules/lists_sum/common.py b/python/problems/functions_and_modules/lists_sum/common.py
index cfdb179..37f5f91 100644
--- a/python/problems/functions_and_modules/lists_sum/common.py
+++ b/python/problems/functions_and_modules/lists_sum/common.py
@@ -22,7 +22,7 @@ hint_type = {
     'final_hint': Hint('final_hint')
 }
 
-def test(python, code):
+def test(python, code, aux_code=''):
     func_name = 'lists_sum'
     tokens = get_tokens(code)
     if not has_token_sequence(tokens, ['def', func_name]):
@@ -41,7 +41,7 @@ def test(python, code):
     test_in = [(func_name+'(%s)'%str(l[0]), None) for l in in_out]
     test_out = [l[1] for l in in_out]
 
-    answers = python(code=code, inputs=test_in, timeout=1.0)
+    answers = python(code=aux_code+code, inputs=test_in, timeout=1.0)
     n_correct = 0
     tin, tout = None, None
     for i, (ans, to) in enumerate(zip(answers, test_out)):
@@ -59,11 +59,11 @@ def test(python, code):
     return passed, hints
 
 
-def hint(python, code):
+def hint(python, code, aux_code=''):
     tokens = get_tokens(code)
 
     # run one test first to see if there are any exceptions
-    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    answer = python(code=aux_code+code, inputs=[(None, None)], timeout=1.0)
     exc = get_exception_desc(answer[0][3])
     if exc: return exc
 
diff --git a/python/problems/functions_and_modules/longest_word/common.py b/python/problems/functions_and_modules/longest_word/common.py
index addf024..db8e92c 100644
--- a/python/problems/functions_and_modules/longest_word/common.py
+++ b/python/problems/functions_and_modules/longest_word/common.py
@@ -20,7 +20,7 @@ hint_type = {
     'final_hint': Hint('final_hint')
 }
 
-def test(python, code):
+def test(python, code, aux_code=''):
     func_name = 'longest'
     tokens = get_tokens(code)
     if not has_token_sequence(tokens, ['def', func_name]):
@@ -40,7 +40,7 @@ def test(python, code):
     test_in = [(func_name+'("%s")'%str(l[0]), None) for l in in_out]
     test_out = [l[1] for l in in_out]
 
-    answers = python(code=code, inputs=test_in, timeout=1.0)
+    answers = python(code=aux_code+code, inputs=test_in, timeout=1.0)
     n_correct = 0
     tin, tout = None, None
     for i, (ans, to) in enumerate(zip(answers, test_out)):
@@ -58,11 +58,11 @@ def test(python, code):
     return passed, hints
 
 
-def hint(python, code):
+def hint(python, code, aux_code=''):
     tokens = get_tokens(code)
 
     # run one test first to see if there are any exceptions
-    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    answer = python(code=aux_code+code, inputs=[(None, None)], timeout=1.0)
     exc = get_exception_desc(answer[0][3])
     if exc: return exc
 
diff --git a/python/problems/functions_and_modules/map/common.py b/python/problems/functions_and_modules/map/common.py
index 2d0f3f8..57bff55 100644
--- a/python/problems/functions_and_modules/map/common.py
+++ b/python/problems/functions_and_modules/map/common.py
@@ -19,7 +19,7 @@ hint_type = {
     'final_hint': Hint('final_hint')
 }
 
-def test(python, code):
+def test(python, code, aux_code=''):
     func_name = 'map'
     tokens = get_tokens(code)
     if not has_token_sequence(tokens, ['def', func_name]):
@@ -34,7 +34,7 @@ def test(python, code):
     test_in = [(func_name+'({l[0]},{l[1]})'.format(l = l[0]), None) for l in in_out]
     test_out = [l[1] for l in in_out]
 
-    answers = python(code=code, inputs=test_in, timeout=1.0)
+    answers = python(code=aux_code+code, inputs=test_in, timeout=1.0)
     n_correct = 0
     tin, tout = None, None
     for i, (ans, to) in enumerate(zip(answers, test_out)):
@@ -52,11 +52,11 @@ def test(python, code):
     return passed, hints
 
 
-def hint(python, code):
+def hint(python, code, aux_code=''):
     tokens = get_tokens(code)
 
     # run one test first to see if there are any exceptions
-    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    answer = python(code=aux_code+code, inputs=[(None, None)], timeout=1.0)
     exc = get_exception_desc(answer[0][3])
     if exc: return exc
 
diff --git a/python/problems/functions_and_modules/multiplicative_range/common.py b/python/problems/functions_and_modules/multiplicative_range/common.py
index 3cb266e..d310a95 100644
--- a/python/problems/functions_and_modules/multiplicative_range/common.py
+++ b/python/problems/functions_and_modules/multiplicative_range/common.py
@@ -20,7 +20,7 @@ hint_type = {
     'final_hint': Hint('final_hint')
 }
 
-def test(python, code):
+def test(python, code, aux_code=''):
     func_name = 'mrange'
     tokens = get_tokens(code)
     if not has_token_sequence(tokens, ['def', func_name]):
@@ -37,7 +37,7 @@ def test(python, code):
     test_in = [(func_name+'(*%s)'%str(l[0]), None) for l in in_out]
     test_out = [l[1] for l in in_out]
 
-    answers = python(code=code, inputs=test_in, timeout=1.0)
+    answers = python(code=aux_code+code, inputs=test_in, timeout=1.0)
     n_correct = 0
     tin, tout = None, None
     for i, (ans, to) in enumerate(zip(answers, test_out)):
@@ -55,11 +55,11 @@ def test(python, code):
     return passed, hints
 
 
-def hint(python, code):
+def hint(python, code, aux_code=''):
     tokens = get_tokens(code)
 
     # run one test first to see if there are any exceptions
-    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    answer = python(code=aux_code+code, inputs=[(None, None)], timeout=1.0)
     exc = get_exception_desc(answer[0][3])
     if exc: return exc
 
diff --git a/python/problems/functions_and_modules/similarity/common.py b/python/problems/functions_and_modules/similarity/common.py
index 0f13fcf..59fc475 100644
--- a/python/problems/functions_and_modules/similarity/common.py
+++ b/python/problems/functions_and_modules/similarity/common.py
@@ -20,7 +20,7 @@ hint_type = {
     'final_hint': Hint('final_hint')
 }
 
-def test(python, code):
+def test(python, code, aux_code=''):
     func_name = 'similarity'
     tokens = get_tokens(code)
     if not has_token_sequence(tokens, ['def', func_name]):
@@ -42,7 +42,7 @@ def test(python, code):
     test_in = [(func_name+'(*%s)'%str(l[0]), None) for l in in_out]
     test_out = [l[1] for l in in_out]
 
-    answers = python(code=code, inputs=test_in, timeout=1.0)
+    answers = python(code=aux_code+code, inputs=test_in, timeout=1.0)
     n_correct = 0
     tin, tout = None, None
     for i, (ans, to) in enumerate(zip(answers, test_out)):
@@ -60,11 +60,11 @@ def test(python, code):
     return passed, hints
 
 
-def hint(python, code):
+def hint(python, code, aux_code=''):
     tokens = get_tokens(code)
 
     # run one test first to see if there are any exceptions
-    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    answer = python(code=aux_code+code, inputs=[(None, None)], timeout=1.0)
     exc = get_exception_desc(answer[0][3])
     if exc: return exc
 
diff --git a/python/problems/functions_and_modules/suspicious_words/common.py b/python/problems/functions_and_modules/suspicious_words/common.py
index 71000d0..2967e01 100644
--- a/python/problems/functions_and_modules/suspicious_words/common.py
+++ b/python/problems/functions_and_modules/suspicious_words/common.py
@@ -20,7 +20,7 @@ hint_type = {
     'final_hint': Hint('final_hint')
 }
 
-def test(python, code):
+def test(python, code, aux_code=''):
     func_name = 'suspicious'
     tokens = get_tokens(code)
     if not has_token_sequence(tokens, ['def', func_name]):
@@ -39,7 +39,7 @@ def test(python, code):
     test_in = [(func_name+"('"+l[0]+"')", None) for l in in_out]
     test_out = [l[1] for l in in_out]
 
-    answers = python(code=code, inputs=test_in, timeout=1.0)
+    answers = python(code=aux_code+code, inputs=test_in, timeout=1.0)
     n_correct = 0
     tin, tout = None, None
     for i, (ans, to) in enumerate(zip(answers, test_out)):
@@ -57,11 +57,11 @@ def test(python, code):
     return passed, hints
 
 
-def hint(python, code):
+def hint(python, code, aux_code=''):
     tokens = get_tokens(code)
 
     # run one test first to see if there are any exceptions
-    answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+    answer = python(code=aux_code+code, inputs=[(None, None)], timeout=1.0)
     exc = get_exception_desc(answer[0][3])
     if exc: return exc
 
-- 
cgit v1.2.1