Merge branch 'master' of 192.168.15.97:codeq-problems

1 files changed, 5 insertions, 7 deletions

diff --git a/prolog/problems/family_relations/brother_2/common.py b/prolog/problems/family_relations/brother_2/common.py
index 0df2d73..327e746 100644
--- a/prolog/problems/family_relations/brother_2/common.py
+++ b/prolog/problems/family_relations/brother_2/common.py
@@ -24,7 +24,7 @@ brother(X, Y) :-
 hint_type = {
     'x_must_be_male': Hint('x_must_be_male'),
     'common_parent_needed': Hint('common_parent_needed'),
-    'Y_can_be_of_any_gender': Hint('Y_can_be_of_any_gender'),
+    'y_can_be_of_any_gender': Hint('Y_can_be_of_any_gender'),
     'x_y_must_be_different': Hint('x_y_must_be_different'),
 }
 
@@ -87,14 +87,12 @@ def hint(program, solved_problems):
         # Y can be of any gender, incl. female
         if prolog.engine.ask_one(engine_id,
             'brother(_, Y), female(Y)') == 'false':
-            return [{'id': 'Y_can_be_of_any_gender'}]
+            return [{'id': 'y_can_be_of_any_gender'}]
 
         # X and Y must be different
-        ans = prolog.engine.ask_one(engine_id,
-            'setof(X, (member(X, [william, alessandro, andrew]), brother(X, X)), L), length(L, N).')
-        # TODO this barfs if ans is 'false'
-        #if ans.get('N') == '3':
-        #    return [{'id': 'x_y_must_be_different'}]
+        if prolog.engine.ask_truth(engine_id,
+            'setof(X, (member(X, [william, alessandro, andrew]), brother(X, X)), L), length(L, 3)'):
+            return [{'id': 'x_y_must_be_different'}]
 
     except socket.timeout as ex:
         pass