summaryrefslogtreecommitdiff
path: root/python/problems/introduction/ballistics
diff options
context:
space:
mode:
authorTimotej Lazar <timotej.lazar@fri.uni-lj.si>2016-10-06 14:40:16 +0200
committerTimotej Lazar <timotej.lazar@fri.uni-lj.si>2016-10-06 14:41:03 +0200
commitd29fed213caccc7bf2f66ed7a11b94b4bbcac3d1 (patch)
tree04f96da9e5a4ea6572db9700907959eae295305b /python/problems/introduction/ballistics
parent969812724912512740dbf037940a9e6770df19ed (diff)
Python: add support for auxiliary code (like for Prolog)
Diffstat (limited to 'python/problems/introduction/ballistics')
-rw-r--r--python/problems/introduction/ballistics/common.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/python/problems/introduction/ballistics/common.py b/python/problems/introduction/ballistics/common.py
index 326650b..beb1c6c 100644
--- a/python/problems/introduction/ballistics/common.py
+++ b/python/problems/introduction/ballistics/common.py
@@ -36,7 +36,7 @@ def contains_negative(s):
return True
return False
-def test(python, code):
+def test(python, code, aux_code=''):
# List of inputs: (expression to eval, stdin).
test_in = [
(None, '45\n100\n'),
@@ -69,7 +69,7 @@ def test(python, code):
]
# List of outputs: (expression result, stdout, stderr, exception).
- answers = python(code=code, inputs=test_in, timeout=1.0)
+ answers = python(code=aux_code+code, inputs=test_in, timeout=1.0)
outputs = [ans[1] for ans in answers]
n_correct = 0
@@ -90,12 +90,12 @@ def test(python, code):
hints.append({'id': 'final_hint'})
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
test_in = [(None, '5\n10\n')]
- answer = python(code=code, inputs=test_in, timeout=1.0)
+ answer = python(code=aux_code+code, inputs=test_in, timeout=1.0)
exc = answer[0][3]
exc_hint = get_exception_desc(answer[0][3])
if exc: