From 56d84be5cfb800f73195cd47c54c5903ba96c6ce Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Tue, 17 Nov 2015 18:27:12 +0100
Subject: Fix test functions for Prolog problems
Old version would return wrong values for programs with syntax errors.
---
.../problems/family_relations/grandparent_2/common.py | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
(limited to 'prolog/problems/family_relations/grandparent_2')
diff --git a/prolog/problems/family_relations/grandparent_2/common.py b/prolog/problems/family_relations/grandparent_2/common.py
index f7b81b6..1657509 100644
--- a/prolog/problems/family_relations/grandparent_2/common.py
+++ b/prolog/problems/family_relations/grandparent_2/common.py
@@ -47,19 +47,17 @@ def test(program, solved_problems):
server.problems.solutions_for_problems('prolog', solved_problems) + '\n' +
server.problems.load_facts('prolog', facts).facts)
+ 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)
--
cgit v1.2.1