From a37c3602e0deaa6da902b1202325b80624e21724 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 20 Mar 2016 17:13:12 +0100 Subject: Prolog: add triggers for palindrome/min/max hints --- prolog/problems/lists_advanced/max_2/common.py | 42 +++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 4 deletions(-) (limited to 'prolog/problems/lists_advanced/max_2/common.py') diff --git a/prolog/problems/lists_advanced/max_2/common.py b/prolog/problems/lists_advanced/max_2/common.py index 86f0e5a..35fe299 100644 --- a/prolog/problems/lists_advanced/max_2/common.py +++ b/prolog/problems/lists_advanced/max_2/common.py @@ -26,6 +26,12 @@ hint_type = { 'base_case': Hint('base_case'), 'recursive_case': Hint('recursive_case'), 'timeout': Hint('timeout'), + 'empty_list_base_case': Hint('empty_list_base_case'), + 'list_instead_of_elem_base_case': Hint('list_instead_of_elem_base_case'), + 'duplicates_not_covered': Hint('duplicates_not_covered'), + 'args_not_instantiated': Hint('args_not_instantiated'), + 'unprotected_branch': Hint('unprotected_branch'), + 'one_branch_missing': Hint('one_branch_missing'), } test_cases = [ @@ -72,14 +78,42 @@ def hint(code, aux_code): return [{'id': 'eq_instead_of_equ_markup', 'start': m[0], 'end': m[1]} for m in marks] + \ [{'id': 'eq_instead_of_equ'}] - # missing/failed base case - if not prolog.engine.ask_truthTO(engine_id, 'max([-45], -45)'): - return [{'id': 'base_case'}] - # target predicate seems to always be false if not prolog.engine.ask_truthTO(engine_id, 'max(_, _)'): return [{'id': 'predicate_always_false'}] + if prolog.engine.ask_truthTO(engine_id, 'max([], _)'): + return [{'id': 'empty_list_base_case'}] + + if prolog.engine.ask_truthTO(engine_id, 'max([39], [39])'): + return [{'id': 'list_instead_of_elem_base_case'}] + + if prolog.engine.ask_truthTO(engine_id, + 'max([1, 3, 9], 9), max([3, 9, 27, 1], 27), \+ max([3, 3, 3], 3)'): + return [{'id': 'duplicates_not_covered'}] + + reply, output = prolog.engine.ask(engine_id, + 'max([1, 2, 2, 2, 3], 3), max([3, 2, 2, 2, 1], 3)', timeout=1) + if reply.get('code') == 'instantiation_error': + return [{'id': 'args_not_instantiated'}] + + # TODO is the ! necessary here? + if prolog.engine.ask_truthTO(engine_id, + 'findall(M, max([3, 5, 2, 4, 1], M), L), member(X, L), X < 5, !'): + return [{'id': 'unprotected_branch'}] + + if prolog.engine.ask_truthTO(engine_id, '''\ + max([1, 2, 3, 4, 5], 5), + \+ max([5, 4, 3, 2, 1], 5) + ; + \+ max([1, 2, 3, 4, 5], 5), + max([5, 4, 3, 2, 1], 5)'''): + return [{'id': 'one_branch_missing'}] + + # missing/failed base case + if not prolog.engine.ask_truthTO(engine_id, 'max([-45], -45)'): + return [{'id': 'base_case'}] + # base case works, the recursive doesn't (but it doesn't timeout) # this may be left as the last, most generic hint if not prolog.engine.ask_truth(engine_id, 'max([2, 41, -22], 41)'): -- cgit v1.2.1