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/min_2/common.py | 42 +++++++++++++++++++++++--- prolog/problems/lists_advanced/min_2/sl.py | 24 +++++++++++++++ 2 files changed, 62 insertions(+), 4 deletions(-) (limited to 'prolog/problems/lists_advanced/min_2') diff --git a/prolog/problems/lists_advanced/min_2/common.py b/prolog/problems/lists_advanced/min_2/common.py index f2412fd..c9a697c 100644 --- a/prolog/problems/lists_advanced/min_2/common.py +++ b/prolog/problems/lists_advanced/min_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, 'min([-45], -45)'): - return [{'id': 'base_case'}] - # target predicate seems to always be false if not prolog.engine.ask_truthTO(engine_id, 'min(_, _)'): return [{'id': 'predicate_always_false'}] + if prolog.engine.ask_truthTO(engine_id, 'min([], _)'): + return [{'id': 'empty_list_base_case'}] + + if prolog.engine.ask_truthTO(engine_id, 'min([39], [39])'): + return [{'id': 'list_instead_of_elem_base_case'}] + + if prolog.engine.ask_truthTO(engine_id, + 'min([1, 3, 9], 1), min([3, 9, 27, 1], 1), \+ min([3, 3, 3], 3)'): + return [{'id': 'duplicates_not_covered'}] + + reply, output = prolog.engine.ask(engine_id, + 'min([1, 2, 2, 2, 3], 1), min([3, 2, 2, 2, 1], 1)', 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, min([1, 5, 2, 4, 3], M), L), member(X, L), X > 1, !'): + return [{'id': 'unprotected_branch'}] + + if prolog.engine.ask_truthTO(engine_id, '''\ + min([1, 2, 3, 4, 5], 1), + \+ min([5, 4, 3, 2, 1], 1) + ; + \+ min([1, 2, 3, 4, 5], 1), + min([5, 4, 3, 2, 1], 1)'''): + return [{'id': 'one_branch_missing'}] + + # missing/failed base case + if not prolog.engine.ask_truthTO(engine_id, 'min([-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, 'min([2, 41, -22], -22)'): diff --git a/prolog/problems/lists_advanced/min_2/sl.py b/prolog/problems/lists_advanced/min_2/sl.py index 38581d6..8f80e3f 100644 --- a/prolog/problems/lists_advanced/min_2/sl.py +++ b/prolog/problems/lists_advanced/min_2/sl.py @@ -43,5 +43,29 @@ da je X hkrati starš in sestra od Y ali kaj podobno z 'timeout': '''\

Je morda na delu potencialno neskončna rekurzija? Kako se bo ustavila?

Morda pa je kriv tudi manjkajoč, neustrezen ali preprosto nekompatibilen (s splošnim primerom) robni pogoj?

+''', + + 'empty_list_base_case': '''\ +

empty_list_base_case

+''', + + 'list_instead_of_elem_base_case': '''\ +

list_instead_of_elem_base_case

+''', + + 'duplicates_not_covered': '''\ +

duplicates_not_covered

+''', + + 'args_not_instantiated': '''\ +

args_not_instantiated

+''', + + 'unprotected_branch': '''\ +

unprotected_branch

+''', + + 'one_branch_missing': '''\ +

one_branch_missing

''', } -- cgit v1.2.1