summaryrefslogtreecommitdiff
path: root/prolog/problems/lists/conc_3
diff options
context:
space:
mode:
authorTimotej Lazar <timotej.lazar@fri.uni-lj.si>2015-11-17 18:27:12 +0100
committerTimotej Lazar <timotej.lazar@fri.uni-lj.si>2015-11-17 18:27:12 +0100
commit56d84be5cfb800f73195cd47c54c5903ba96c6ce (patch)
treee1423e5cc66cb31d4b71e9096205008ac0248672 /prolog/problems/lists/conc_3
parented08fc31d7332b3c141f68d15e1b63eada4d4b27 (diff)
Fix test functions for Prolog problems
Old version would return wrong values for programs with syntax errors.
Diffstat (limited to 'prolog/problems/lists/conc_3')
-rw-r--r--prolog/problems/lists/conc_3/common.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/prolog/problems/lists/conc_3/common.py b/prolog/problems/lists/conc_3/common.py
index be4f118..a36d097 100644
--- a/prolog/problems/lists/conc_3/common.py
+++ b/prolog/problems/lists/conc_3/common.py
@@ -30,19 +30,17 @@ def test(program, solved_problems):
code = (program + '\n' +
server.problems.solutions_for_problems('prolog', solved_problems))
+ n_correct = 0
engine_id = None
try:
engine_id, output = prolog.engine.create(code=code, timeout=1.0)
- if not engine_id or 'error' in map(itemgetter(0), output):
- # Engine creation failed, or syntax error in code.
- return 0, len(test_cases)
-
- n_correct = 0
- for query, answers in test_cases:
- # Limit inferences for each solution to curb unbounded recursion.
- limited = 'call_with_inference_limit(({}), 100000, _)'.format(query)
- if prolog.engine.check_answers(engine_id, query=limited, answers=answers, timeout=1.0):
- n_correct += 1
+ if engine_id is not None and 'error' not in map(itemgetter(0), output):
+ # Engine successfully created, and no syntax error in program.
+ for query, answers in test_cases:
+ # Limit inferences for each solution to curb unbounded recursion.
+ limited = 'call_with_inference_limit(({}), 100000, _)'.format(query)
+ if prolog.engine.check_answers(engine_id, query=limited, answers=answers, timeout=1.0):
+ n_correct += 1
finally:
if engine_id:
prolog.engine.destroy(engine_id)