From 86bfc55d2ddc19b79127f2c788609635b702dbfd Mon Sep 17 00:00:00 2001
From: Aleksander Sadikov <aleksander.sadikov@fri.uni-lj.si>
Date: Sat, 17 Oct 2015 20:04:54 +0200
Subject: Family relations section fully hint-ready (just a few minor things
 missing).

---
 .../problems/family_relations/ancestor_2/common.py | 37 +++++++++++++---------
 1 file changed, 22 insertions(+), 15 deletions(-)

(limited to 'prolog/problems/family_relations/ancestor_2/common.py')

diff --git a/prolog/problems/family_relations/ancestor_2/common.py b/prolog/problems/family_relations/ancestor_2/common.py
index 7249ed8..94b7e68 100644
--- a/prolog/problems/family_relations/ancestor_2/common.py
+++ b/prolog/problems/family_relations/ancestor_2/common.py
@@ -4,7 +4,7 @@ from operator import itemgetter
 import socket
 import prolog.engine
 import prolog.util
-from server.hints import Hint, HintSequence
+from server.hints import Hint, HintPopup
 import server.problems
 
 id = 100
@@ -21,8 +21,10 @@ ancestor(X, Y) :-
 '''
 
 hint_type = {
+    'gender_is_irrelevant_markup': HintPopup('gender_is_irrelevant_markup'),
     'gender_is_irrelevant': Hint('gender_is_irrelevant'),
     'grandparent_used': Hint('grandparent_used'),
+    'grandparent_used_markup': HintPopup('grandparent_used_markup'),
     'base_case': Hint('base_case'),
     'ancestor_to_oneself': Hint('ancestor_to_oneself'),
     'descendant_need_not_be_parent': Hint('descendant_need_not_be_parent'),
@@ -30,7 +32,12 @@ hint_type = {
 }
 
 test_cases = [
-    # TODO
+    ('ancestor(ana, X)',
+        [{'X': 'aleksander'}, {'X': 'luana'}, {'X': 'daniela'}]),
+    ('ancestor(morty, X)',
+        [{'X': 'jerry'}, {'X': 'anna'}]),
+    ('ancestor(X, susan)',
+        [{'X': 'vanessa'}, {'X': 'patrick'}, {'X': 'tina'}, {'X': 'thomas'}, {'X': 'william'}]),
 ]
 
 def test(program, solved_problems):
@@ -75,29 +82,29 @@ def hint(program, solved_problems):
         # gender testing is redundant
         # this is not necessarily wrong, but worth mentioning anyway
         targets = [prolog.util.Token('NAME', 'male'), prolog.util.Token('NAME', 'female')]
-        pos = [(t.pos, t.pos + len(t.val)) for t in tokens if t in targets]
-        if pos:
-            # TODO: resolve how highlighting info is communicated
-            return [{'id': 'gender_is_irrelevant', 'highlight': pos}]
+        marks = [(t.pos, t.pos + len(t.val)) for t in tokens if t in targets]
+        if marks:
+            return [{'id': 'gender_is_irrelevant_markup', 'start': m[0], 'end': m[1]} for m in marks] + \
+                   [{'id': 'gender_is_irrelevant'}]
 
         # grandparent is a sign of complications
         # it's likely used instead of recursion
         targets = [prolog.util.Token('NAME', 'grandparent')]
-        pos = [(t.pos, t.pos + len(t.val)) for t in tokens if t in targets]
-        if pos:
-            # TODO: resolve how highlighting info is communicated
-            return [{'id': 'grandparent_used', 'highlight': pos}]
+        marks = [(t.pos, t.pos + len(t.val)) for t in tokens if t in targets]
+        if marks:
+            return [{'id': 'grandparent_used_markup', 'start': m[0], 'end': m[1]} for m in marks] + \
+                   [{'id': 'grandparent_used'}]
 
         # missing/failed base case
         # TODO: how will ask_truth handle/return timeouts...
         # TODO: timeout is the same as fail in this particular case
         if prolog.engine.ask_truth(engine_id,
             'parent(X, Y), \+ ancestor(X, Y)'):
-            return [{'id', 'base_case'}]
+            return [{'id': 'base_case'}]
 
         # ancestor to oneself
         if prolog.engine.ask_truth(engine_id, 'ancestor(X, X)'):
-            return [{'id', 'ancestor_to_oneself'}]
+            return [{'id': 'ancestor_to_oneself'}]
 
         # Y does not necessarily need to be a parent
         if prolog.engine.ask_one(engine_id,
@@ -109,14 +116,14 @@ def hint(program, solved_problems):
         if prolog.engine.ask_truth(engine_id,
             'findall(_, ancestor(william, X), L1), length(L1, 2), \
              findall(_, ancestor(X, william), L2), length(L2, 6)'):
-            return [{'id', 'wrong_direction'}]
+            return [{'id': 'wrong_direction'}]
 
     except socket.timeout as ex:
-        pass
+        return [{'id': 'base_case'}]
 
     finally:
         if engine_id:
             prolog.engine.destroy(engine_id)
 
-    return None
+    return []
 
-- 
cgit v1.2.1