summaryrefslogtreecommitdiff
path: root/prolog/problems/family_relations/brother_2
diff options
context:
space:
mode:
authorMartin <martin@leo.fri1.uni-lj.si>2015-09-23 10:21:51 +0200
committerMartin <martin@leo.fri1.uni-lj.si>2015-09-23 10:21:51 +0200
commitbb366684ada98e140b1911c54d6c40fd911904cf (patch)
treee3b4f50ffd033d179c0c38d290ce33b7f99c800a /prolog/problems/family_relations/brother_2
parente0a5dd801c8382848b28503a81c141d0d15f5833 (diff)
parent76639241146ac5655ae04ea773ada420adb15295 (diff)
Merge branch 'master' of 192.168.15.97:codeq-problems
Diffstat (limited to 'prolog/problems/family_relations/brother_2')
-rw-r--r--prolog/problems/family_relations/brother_2/common.py12
-rw-r--r--prolog/problems/family_relations/brother_2/sl.py2
2 files changed, 6 insertions, 8 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
diff --git a/prolog/problems/family_relations/brother_2/sl.py b/prolog/problems/family_relations/brother_2/sl.py
index 116a968..2176bd8 100644
--- a/prolog/problems/family_relations/brother_2/sl.py
+++ b/prolog/problems/family_relations/brother_2/sl.py
@@ -38,7 +38,7 @@ hint = {
<p>Brat je navadno moškega spola.</p>
''',
- 'Y_can_be_of_any_gender': '''\
+ 'y_can_be_of_any_gender': '''\
<p><code>Y</code> je pravzaprav lahko poljubnega spola.</p>
''',