From dce85b3e2ee99ca3a6692ebdd862b8a228c87f19 Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@araneo.org>
Date: Thu, 17 Sep 2015 18:03:55 +0200
Subject: Use check_answers instead of ask_all for testing
Simplify the testing function and add correct test cases for Prolog
problems mother/2 and brother/2.
---
.../problems/family_relations/brother_2/common.py | 35 +++++++++++-----------
1 file changed, 18 insertions(+), 17 deletions(-)
(limited to 'prolog/problems/family_relations/brother_2')
diff --git a/prolog/problems/family_relations/brother_2/common.py b/prolog/problems/family_relations/brother_2/common.py
index 48bc519..e725682 100644
--- a/prolog/problems/family_relations/brother_2/common.py
+++ b/prolog/problems/family_relations/brother_2/common.py
@@ -1,5 +1,6 @@
# coding=utf-8
+from operator import itemgetter
import socket
import prolog.engine
import prolog.util
@@ -28,15 +29,15 @@ hint_typs = {
'x_y_must_be_different': Hint('x_y_must_be_different'),
}
-def test(program, solved_problems):
- # TODO: change queries and answers (these are for sister/2)
- # Test queries and expected answers (values of X).
- queries = [
- ('sister(melanie, X)', set(['andrew'])),
- ('sister(X, andrew)', set(['melanie'])),
- ('sister(X, _)', set(['michelle', 'daniela', 'patricia', 'luana', 'sally', 'melanie', 'nevia', 'vanessa', 'anna'])),
- ]
+test_cases = [
+ ('brother(X, _)',
+ [{'X': 'alessandro'}, {'X': 'andrew'}, {'X': 'jeffrey'},
+ {'X': 'kramer'}, {'X': 'michael'}, {'X': 'william'}]),
+ ('brother(andrew, X)',
+ [{'X': 'melanie'}]),
+]
+def test(program, solved_problems):
code = (program + '\n' +
server.problems.solutions_for_problems('prolog', solved_problems) + '\n' +
server.problems.load_facts('prolog', facts).facts)
@@ -44,21 +45,21 @@ def test(program, solved_problems):
engine_id = None
try:
engine_id, output = prolog.engine.create(code=code, timeout=1.0)
- if not engine_id:
- return 0, len(queries)
+ 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, solution in queries:
- answers, error = prolog.engine.ask_all(engine_id, query=query, timeout=1.0)
- if answers and answers[-1] != 'timed out':
- values_x = set([ans.get('X') for ans, constraints in answers])
- if values_x == solution:
- n_correct += 1
+ 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)
- return n_correct, len(queries)
+ return n_correct, len(test_cases)
def hint(program, solved_problems):
# tokens = prolog.util.tokenize(program)
--
cgit v1.2.1