summaryrefslogtreecommitdiff
path: root/prolog/problems/family_relations/sister_2/common.py
diff options
context:
space:
mode:
authorAleksander Sadikov <aleksander.sadikov@fri.uni-lj.si>2016-02-28 22:14:02 +0100
committerAleksander Sadikov <aleksander.sadikov@fri.uni-lj.si>2016-02-28 22:14:02 +0100
commitbc40d810afbcde332730d50ed490deb432689db1 (patch)
treeef9dae0e3e67af9c8b1013d5406b87550b326b47 /prolog/problems/family_relations/sister_2/common.py
parent74022caadc0b526c8f4224786a98aa7504ab035f (diff)
sister/2 and brother/2 hints improved.
Diffstat (limited to 'prolog/problems/family_relations/sister_2/common.py')
-rw-r--r--prolog/problems/family_relations/sister_2/common.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/prolog/problems/family_relations/sister_2/common.py b/prolog/problems/family_relations/sister_2/common.py
index 08f44b3..1bc9365 100644
--- a/prolog/problems/family_relations/sister_2/common.py
+++ b/prolog/problems/family_relations/sister_2/common.py
@@ -26,6 +26,7 @@ hint_type = {
'y_can_be_of_any_gender': Hint('y_can_be_of_any_gender'),
'x_y_must_be_different': Hint('x_y_must_be_different'),
'neq_used_too_early': Hint('neq_used_too_early'),
+ 'nm_instead_of_neq': Hint('nm_instead_of_neq'),
}
test_cases = [
@@ -102,10 +103,14 @@ def hint(code, aux_code):
# as this is after previous hints, by this stage the code probably
# does return some sensible results already
# this is an example of using the ordering of hints for easier trigger checks
- if prolog.engine.ask_one(engine_id,
- 'sister(_, Y), male(Y)') == 'false':
+ if prolog.engine.ask_truth(engine_id, 'sister(_, Y)') and \
+ prolog.engine.ask_one(engine_id, 'sister(_, Y), male(Y)') == 'false':
return [{'id': 'y_can_be_of_any_gender'}]
+ # use of \= instead of \==
+ if prolog.util.Token('NEQ', '\=') in tokens:
+ return [{'id': 'nm_instead_of_neq'}]
+
# X and Y must be different
# this is the last code-specific hint (when everything else doesn't trigger anymore)
if prolog.util.Token('NEQ', '\==') not in tokens and prolog.engine.ask_truth(engine_id,