From b202e2d5007ca9a53b4ffac4cc2224d647119dbc Mon Sep 17 00:00:00 2001
From: Timotej Lazar Si pomislil, da sta Loni naj zbriše imena relacij (parent, mother) s te slike! Loni naj zbriše imena relacij (parent, mother) s te slike! Če je
parent(P, X)
parent(P, Y)
male(X)
-
-'''],
+'''
+]
+hint = {
'x_y_must_be_different': '''\
X
in Y
lahko ista oseba? Poskusi naslednjo poizvedbo:
diff --git a/prolog/problems/family_relations/father_2/common.py b/prolog/problems/family_relations/father_2/common.py
index 1816d56..1342441 100644
--- a/prolog/problems/family_relations/father_2/common.py
+++ b/prolog/problems/family_relations/father_2/common.py
@@ -20,7 +20,6 @@ father(X, Y) :-
'''
hint_type = {
- 'general_hint': HintSequence('general_hint', 3),
'or_instead_of_and': Hint('or_instead_of_and'),
'x_must_be_male': Hint('x_must_be_male'),
'x_must_be_parent': Hint('x_must_be_parent'),
diff --git a/prolog/problems/family_relations/father_2/sl.py b/prolog/problems/family_relations/father_2/sl.py
index 8fb66c5..ee6893b 100644
--- a/prolog/problems/family_relations/father_2/sl.py
+++ b/prolog/problems/family_relations/father_2/sl.py
@@ -15,17 +15,18 @@ description = '''\
X = daniela.
'''
-hint = {
- 'general_hint': ['''\
-
-X
ženska in je hkrati X
starš od Y
,
-potem je X
mama od Y
.X
mama od Y
.
Si morda uporabil podpičje (ki pomeni ALI) namesto vejice (ki pomeni IN)?
''', diff --git a/prolog/problems/family_relations/mother_2/common.py b/prolog/problems/family_relations/mother_2/common.py index 3a7e196..4d198d4 100644 --- a/prolog/problems/family_relations/mother_2/common.py +++ b/prolog/problems/family_relations/mother_2/common.py @@ -20,7 +20,6 @@ mother(X, Y) :- ''' hint_type = { - 'general_hint': HintSequence('general_hint', 3), 'or_instead_of_and': Hint('or_instead_of_and'), 'x_must_be_female': Hint('x_must_be_female'), 'x_must_be_parent': Hint('x_must_be_parent'), diff --git a/prolog/problems/family_relations/mother_2/sl.py b/prolog/problems/family_relations/mother_2/sl.py index 5922d6c..3494096 100644 --- a/prolog/problems/family_relations/mother_2/sl.py +++ b/prolog/problems/family_relations/mother_2/sl.py @@ -14,17 +14,18 @@ description = '''\ X = daniela. ''' -hint = { - 'general_hint': ['''\ - -Loni naj zbriše imena relacij (parent, mother) s te slike!
-''', '''\ +plan = [ + '''\ -''', '''\ +Loni naj zbriše imena relacij (parent, mother) s te slike!
''', + '''\ +''', + '''\Če je X
ženska in je hkrati X
starš od Y
,
-potem je X
mama od Y
.
X
mama od Y
.'''
+]
+hint = {
'or_instead_of_and': '''\
Si morda uporabil podpičje (ki pomeni ALI) namesto vejice (ki pomeni IN)?
''', diff --git a/prolog/problems/family_relations/sister_2/common.py b/prolog/problems/family_relations/sister_2/common.py index a1375f2..1ae652a 100644 --- a/prolog/problems/family_relations/sister_2/common.py +++ b/prolog/problems/family_relations/sister_2/common.py @@ -22,7 +22,6 @@ sister(X, Y) :- ''' hint_type = { - 'general_hint': HintSequence('general_hint', 3), 'x_must_be_female': Hint('x_must_be_female'), 'common_parent_needed': Hint('common_parent_needed'), 'Y_can_be_of_any_gender': Hint('Y_can_be_of_any_gender'), diff --git a/prolog/problems/family_relations/sister_2/sl.py b/prolog/problems/family_relations/sister_2/sl.py index b2683c4..aa66567 100644 --- a/prolog/problems/family_relations/sister_2/sl.py +++ b/prolog/problems/family_relations/sister_2/sl.py @@ -11,20 +11,21 @@ description = '''\ X = patricia. ''' -hint = { - 'general_hint': ['''\ - -''', '''\ - -''', '''\ +plan = [ + '''\ +''', + '''\ +''', + '''\parent(P, X) parent(P, Y) female(X) --'''], +''' +] +hint = { 'x_y_must_be_different': '''\
Si pomislil, da sta X
in Y
lahko ista oseba? Poskusi naslednjo poizvedbo:
-- cgit v1.2.1