summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimotej Lazar <timotej.lazar@fri.uni-lj.si>2017-02-24 16:33:09 +0100
committerTimotej Lazar <timotej.lazar@fri.uni-lj.si>2017-02-24 16:33:09 +0100
commit04df55fae1bd1a26edcdfb702a24066ce49f5461 (patch)
treeb05940182892d788d683ee5244de2624f7513cf8
parent3799a733ae04b8667499e6f1b7439ddb0245ca28 (diff)
Prolog: add <code> tags for sister/2 hints
-rw-r--r--prolog/problems/family_relations/sister_2/en.py8
-rw-r--r--prolog/problems/family_relations/sister_2/sl.py6
2 files changed, 8 insertions, 6 deletions
diff --git a/prolog/problems/family_relations/sister_2/en.py b/prolog/problems/family_relations/sister_2/en.py
index cbd975b..46babf0 100644
--- a/prolog/problems/family_relations/sister_2/en.py
+++ b/prolog/problems/family_relations/sister_2/en.py
@@ -45,8 +45,9 @@ For example: <code>X \== Y</code></p>
''',
'neq+_instead_of_neq': '''\
-<p>Use the operator \== instead of operators \= or =\=. It succeeds when the two operands are not the same,
-while \= succeeds if the operands <em>cannot be made</em> the same (cannot be unified), and =\= checks for
+<p>Use the operator <code>\==</code> instead of operators <code>\=</code> or <code>=\=</code>.
+It succeeds when the two operands are not the same,
+while <code>\=</code> succeeds if the operands <em>cannot be made</em> the same (cannot be unified), and <code>=\=</code> checks for
arithmetic inequality and in this case both operands should be immediately arithmetically computable.</p>
''',
@@ -75,7 +76,8 @@ something similarly impossible).</p>
''',
'final_hint': '''\
-<p>In this exercise you used the \== operator. It succeeds if its two operands are not the same
+<p>In this exercise you used the <code>\==</code> (or <code>\=</code>) operator.
+It succeeds if its two operands are not the same
<em>at the moment</em> of comparison. If you put this goal at the start of your rule, it will
not work as expected. (Go ahead, try and see what happens!)</p>
''',
diff --git a/prolog/problems/family_relations/sister_2/sl.py b/prolog/problems/family_relations/sister_2/sl.py
index d0c81c2..7cd8c2a 100644
--- a/prolog/problems/family_relations/sister_2/sl.py
+++ b/prolog/problems/family_relations/sister_2/sl.py
@@ -44,8 +44,8 @@ Na primer: <code>X \== Y</code></p>
''',
'neq+_instead_of_neq': '''\
-<p>Uporabi raje operator \== namesto operatorjev \= ali =\=. Prvi preveri, da oba operanda nista enaka,
-drugi (\=) ju poskusi unificirati (narediti enaka), tretji (=\=) pa je samo za aritmetično primerjanje
+<p>Uporabi raje operator <code>\==</code> namesto operatorjev <code>\=</code> ali <code>=\=</code>. Prvi preveri, da oba operanda nista enaka,
+drugi (<code>\=</code>) ju poskusi unificirati (narediti enaka), tretji (<code>=\=</code>) pa je samo za aritmetično primerjanje
in morata oba operanda biti takoj izračunljiva aritmetična izraza.</p>
''',
@@ -72,7 +72,7 @@ da je <code>X</code> hkrati starš in sestra od <code>Y</code>).</p>
''',
'final_hint': '''\
-<p>Pri tej nalogi si uporabil operator \==. Ta preverja, če njegova operanda nista enaka točno v tistem
+<p>Pri tej nalogi si uporabil operator <code>\==</code> (oziroma <code>\=</code>). Ta preverja, če njegova operanda nista enaka točno v tistem
trenutku, ko prolog naleti nanj. Če ga daš na začetek svoje rešitve, ta ne deluje kot bi si želel.
(Če želiš, lahko to seveda preveriš.)</p>
''',