diff options
author | Aleksander Sadikov <aleksander.sadikov@fri.uni-lj.si> | 2016-08-09 19:21:49 +0200 |
---|---|---|
committer | Aleksander Sadikov <aleksander.sadikov@fri.uni-lj.si> | 2016-08-09 19:21:49 +0200 |
commit | 11efbb77f76902d25a0a4a5ece9145a55205da16 (patch) | |
tree | 16ad3bdb4d928c72d78a4430a4067d0d2d71fda5 /prolog/problems/family_relations | |
parent | eca7d4651ea9e16e8a92520bad7d00fccef867bc (diff) |
English translation for ancestor/2 and descendant/2 updated.
Diffstat (limited to 'prolog/problems/family_relations')
-rw-r--r-- | prolog/problems/family_relations/ancestor_2/en.py | 14 | ||||
-rw-r--r-- | prolog/problems/family_relations/descendant_2/en.py | 3 |
2 files changed, 11 insertions, 6 deletions
diff --git a/prolog/problems/family_relations/ancestor_2/en.py b/prolog/problems/family_relations/ancestor_2/en.py index 322ab92..8e253bd 100644 --- a/prolog/problems/family_relations/ancestor_2/en.py +++ b/prolog/problems/family_relations/ancestor_2/en.py @@ -2,7 +2,8 @@ name = 'ancestor/2' slug = 'the ancestor relation' description = '''\ -<p><code>ancestor(X, Y)</code>: <code>X</code> is an ancestor (parent, grandparent, grandgrandparent, ...) of <code>Y</code>.</p> +<p><code>ancestor(X, Y)</code>: <code>X</code> is an ancestor (parent, grandparent, great-grandparent, ...) +of <code>Y</code>.</p> <pre> ?- ancestor(patricia, X). X = john ; @@ -15,13 +16,16 @@ described with predicates <code>parent/2</code>, <code>male/1</code>, and ''' plan = ['''\ -<p>It's time to use recursion for the first time... how can we transpose the problem to a smaller one (a single step smaller that is)?</p> -<p><img src="[%@resource Prolog_ancestor_03.svg%]" alt="A parent of someone, who is a parent of Y, is also an ancestor of Y." /></p> +<p>It's time to use recursion for the first time... how can we transpose the problem to a smaller one +(a single step smaller that is)?</p> +<p><img src="[%@resource Prolog_ancestor_03.svg%]" alt="A parent of someone, who is a parent of Y, +is also an ancestor of Y." /></p> ''', '''\ <p>If <code>X</code> is a parent of some <code>Z</code> and that <code>Z</code> is an ancestor of <code>Y</code>, then <code>X</code> is also an ancestor of <code>Y</code>.</p> ''', '''\ -<p><img src="[%@resource Prolog_ancestor_04.svg%]" alt="If X is a parent of Z, and Z is an ancestor of Y, then X is also an ancestor of Y." /></p> +<p><img src="[%@resource Prolog_ancestor_04.svg%]" alt="If X is a parent of Z, and Z is an ancestor of Y, +then X is also an ancestor of Y." /></p> '''] hint = { @@ -63,7 +67,7 @@ one another -- assigned values to variables in one branch do not transfer to the 'only_two_levels_deep': '''\ <p>Your solution is not general enough. An ancestor can also be someone "more steps away" than grandparents, -e.g. grandgrandparents or grandgrandgrandparents are also ancestors.</p> +e.g. great-grandparents or great-great-grandparents are also ancestors.</p> ''', 'descendant_need_not_be_parent': '''\ diff --git a/prolog/problems/family_relations/descendant_2/en.py b/prolog/problems/family_relations/descendant_2/en.py index c50ac17..1217e2a 100644 --- a/prolog/problems/family_relations/descendant_2/en.py +++ b/prolog/problems/family_relations/descendant_2/en.py @@ -2,7 +2,8 @@ name = 'descendant/2' slug = 'the descendant relation' description = '''\ -<p><code>descendant(X, Y)</code>: <code>X</code> is a descendant (child, grandchild, ...) of <code>Y</code>.</p> +<p><code>descendant(X, Y)</code>: <code>X</code> is a descendant (child, grandchild, great-grandchild, ...) +of <code>Y</code>.</p> <pre> ?- descendant(patricia, X). X = william ; |