summaryrefslogtreecommitdiff
path: root/python/problems/while_and_if/consumers_anonymous
diff options
context:
space:
mode:
authorMartin <martin@leo.fri1.uni-lj.si>2015-10-07 16:07:05 +0200
committerMartin <martin@leo.fri1.uni-lj.si>2015-10-07 16:07:05 +0200
commitbab0b0a2fe8b3aad853740750d4873fb929f5f41 (patch)
treedff5d20ce51ddb2f50161da0e5d0f139c589315f /python/problems/while_and_if/consumers_anonymous
parent609daf7798f98b0359bb188eb3a83690e93ace7f (diff)
Remove bold text since it looked strange.
Diffstat (limited to 'python/problems/while_and_if/consumers_anonymous')
-rw-r--r--python/problems/while_and_if/consumers_anonymous/common.py2
-rw-r--r--python/problems/while_and_if/consumers_anonymous/sl.py10
2 files changed, 6 insertions, 6 deletions
diff --git a/python/problems/while_and_if/consumers_anonymous/common.py b/python/problems/while_and_if/consumers_anonymous/common.py
index 07a0ebf..b955f49 100644
--- a/python/problems/while_and_if/consumers_anonymous/common.py
+++ b/python/problems/while_and_if/consumers_anonymous/common.py
@@ -111,7 +111,7 @@ def hint(python, code):
return [{'id' : 'printing'}]
# student does not print any values
- if not get_numbers(answer[0][1]):
+ if len(get_numbers(answer[0][1])) < 2:
return [{'id' : 'nonumber'}]
# student's answer is not correct (three possibilities)
diff --git a/python/problems/while_and_if/consumers_anonymous/sl.py b/python/problems/while_and_if/consumers_anonymous/sl.py
index 284abbc..cc5bcb7 100644
--- a/python/problems/while_and_if/consumers_anonymous/sl.py
+++ b/python/problems/while_and_if/consumers_anonymous/sl.py
@@ -46,17 +46,17 @@ Porabili boste 10 evrov za 10 stvari.
'''
main_plan = ['''\
-<p><b>Plan</b> je enak kot pri prejšnjih nalogah: while zanka + izpis števca in vsote. </p>
+<p>Plan je enak kot pri prejšnjih nalogah: while zanka + izpis števca in vsote. </p>
''']
while_condition = ['''\
-<p><b>Pogoj</b> v zanki while bo sestavljen iz več pogojev.</p>''',
+<p>Pogoj v zanki <code>while</code> bo sestavljen iz več pogojev.</p>''',
'''\
<p>V Pythonu združujemo pogoje z logičnimi operatoriji <code>and</code>,
<code>or</code> in <code>not</code></p>'''
'''\
<p>Zanka se ustavi, če presežemo 100 EUR, če smo vpisali 0 ali kupili 10 stvari.
-Vendar pazite: napisati moramo pogoj, kdaj se zanka <b>nadaljuje</b>!</p>''',
+Vendar pazite: napisati moramo pogoj, kdaj se zanka nadaljuje!</p>''',
'''\
<pre>
cena != 0 and vsota < 100 and artiklov < 10
@@ -110,10 +110,10 @@ hint = {
Pravilna vsota [%=sum%], pravilno število stvari: [%=count%]'''],
'final_hint': ['''\
-<p><b>Odlično!</b> Naloga rešena.</p>
+<p>Odlično! Naloga rešena.<br>
Še zanimivost: v while zanki smo dobili ustavitveni pogoj tako, da smo negirali pogoj iz teksta (ali vnesemo 0 ali je
vnešenih deset števil ali ko vsota cen doseže ali preseže 100 evrov). Pri tem smo ali (or) spremenili v in (and):
-<code>cena > 0 and stevec < 10 and vsota < 100</code>. Temu pravimo De Morganov zakon.
+<code>cena > 0 and stevec < 10 and vsota < 100</code>. Temu pravimo De Morganov zakon.</p>
'''],
'eof_error':[mod.general_msg['eof_error'],