Added three problems to while and if section.

11 files changed, 694 insertions, 5 deletions

diff --git a/python/problems/while_and_if/checking_account/common.py b/python/problems/while_and_if/checking_account/common.py
new file mode 100644
index 0000000..610bbfc
--- /dev/null
+++ b/python/problems/while_and_if/checking_account/common.py
@@ -0,0 +1,84 @@
+# coding=utf-8
+
+from python.util import has_token_sequence, string_almost_equal, \
+    string_contains_number, get_tokens, get_numbers, get_exception_desc
+from server.hints import Hint, HintSequence
+
+id = 200
+group = 'while_and_if'
+number = 5
+visible = True
+
+solution = '''\
+stanje = 0
+while stanje > -100:
+    stanje += int(input('Sprememba '))
+    print('Stanje', stanje)
+print('Bankrot')
+'''
+
+hint_type = {
+    'while_clause': Hint('while_clause'),
+    'while_condition': Hint('while_condition'),
+}
+
+def test(python, code):
+    # List of inputs: (expression to eval, stdin).
+    test_in = [
+        (None, '23\n15\n-30\n10\n100\n-200\n-50\n'),
+        (None, '10\n-100\n1000\n-10000\n'),
+        (None, '1\n2\n'),
+        (None, '-1000\n'),
+        (None, '0\n'),
+    ]
+
+    test_out = [
+        (-132, True),
+        (-9090, True),
+        (3, False),
+        (-1000, True),
+        (0, False),
+    ]
+
+    # List of outputs: (expression result, stdout, stderr, exception).
+    answers = python(code=code, inputs=test_in, timeout=1.0)
+    outputs = [ans[1] for ans in answers]
+
+    n_correct = 0
+    tin = None
+    for i, (output, correct) in enumerate(zip(outputs, test_out)):
+        if string_almost_equal(output, correct[0]) and \
+           ('Bankrot' in output) == correct[1]:
+            n_correct += 1
+        else:
+            tin = test_in[i][1]
+            tout = correct
+
+    passed = n_correct == len(test_in)
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_in)}}]
+    if tin:
+        hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin),
+                                                              'sum': str(tout[0]),
+                                                              'bancrupt': str(tout[1])}})
+    return passed, hints
+
+def hint(python, code):
+    tokens = get_tokens(code)
+
+    # run one test first to see if there are any exceptions
+    test_in = [(None, '23\n15\n-30\n8\n10\n100\n-200\n-50\n')]
+    answer = python(code=code, inputs=test_in, timeout=1.0)
+    exc = get_exception_desc(answer[0][3])
+    if exc:
+        return exc
+
+    # student does not have while or for: instruct him on loops
+    if not has_token_sequence(tokens, ['while']) and \
+       not has_token_sequence(tokens, ['for']):
+        return [{'id' : 'while_clause'}]
+
+    # student's answer is not correct
+    if not string_almost_equal(answer[0][1], -132):
+        return [{'id' : 'while_condition'}]
+
+    return None
diff --git a/python/problems/while_and_if/checking_account/en.py b/python/problems/while_and_if/checking_account/en.py
new file mode 100644
index 0000000..f583fd8
--- /dev/null
+++ b/python/problems/while_and_if/checking_account/en.py
@@ -0,0 +1,16 @@
+# coding=utf-8
+
+id = 199
+name = '(translation missing)'
+slug = '(translation missing)'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/while_and_if/checking_account/sl.py b/python/problems/while_and_if/checking_account/sl.py
new file mode 100644
index 0000000..2825431
--- /dev/null
+++ b/python/problems/while_and_if/checking_account/sl.py
@@ -0,0 +1,83 @@
+# coding=utf-8
+import server
+mod = server.problems.load_language('python', 'sl')
+
+id = 200
+name = 'Tekoči račun'
+slug = 'Tekoči račun'
+
+
+description = '''\
+<p>Državna agencija za varstvo potrošnikov je razpisala projekt za izdelavo programa, s katerimi bodo
+lahko potrošniki nadzorovali svoje tekoče račune. V program uporabniki vtipkavajo prejemke in
+izdatke (kot pozitivne in negativne zneske) na svojem tekočem računu. Program jim sproti izpisuje
+stanje in se ustavi, ko je uporabnik v minusu za 100 evrov ali več.</p>
+<pre>
+Sprememba 23
+Stanje 23
+Sprememba 15
+Stanje 38
+Sprememba ­30
+Stanje 8
+Sprememba 10
+Stanje 18
+Sprememba 100
+Stanje 118
+Sprememba ­200
+Stanje ­82
+Sprememba ­50
+Stanje ­132
+Bankrot
+</pre>
+'''
+
+main_plan = ['''\
+<p><b>Plan</b></p> je enak kot pri prejšnjih nalogah, le vsebina je drugačna:
+<pre>
+1.Ponavljaj dokler ni bankrot
+    2.Preberi ceno
+    3.Posodobi vsoto
+4. Izpiši bankrot
+</pre>
+''']
+
+while_condition = ['''\
+<p>Koliko korakov naj naredi zanka?</p>''',
+                   '''\
+<p>Dokler velja, da je stanje višje od 100</p>'''
+                   '''\
+<pre>
+while stanje > -100:
+    ...
+</pre>'''
+]
+
+plan = [main_plan,
+        while_condition]
+
+while_clause = ['''\
+<p>Uporabi zanko <while</p>''',
+         '''\
+<pre>
+while Pogoj:
+    stavek 1
+    stavek 2
+    ...
+stavek n # stavek izven while.
+</pre>''',
+         '''\
+<p>Stavki znotraj while (zamaknjeni) se izvajajo toliko časa, dokler velja <code>Pogoj</code>.
+Ko pogoj ne velja več, Python preskoči vrstice, ki so del while-a in nadaljuje s stavki, ki sledijo – v
+našem primeru s stavkom n.</p>'''
+        ]
+
+hint = {
+    'while_clause': while_clause,
+
+    'while_condition': while_condition,
+
+    'problematic_test_case': ['''\
+<p>Zaporedje cen, kjer program ne dela prav: [%=testin%]<br>
+Bankrot: [%=bancrupt%], Končno stanje: [%=sum%]''']
+
+}
diff --git a/python/problems/while_and_if/consumers_anonymous/common.py b/python/problems/while_and_if/consumers_anonymous/common.py
new file mode 100644
index 0000000..d1428d8
--- /dev/null
+++ b/python/problems/while_and_if/consumers_anonymous/common.py
@@ -0,0 +1,126 @@
+# coding=utf-8
+
+from python.util import has_token_sequence, string_almost_equal, \
+    string_contains_number, get_tokens, get_numbers, get_exception_desc
+from server.hints import Hint, HintSequence
+
+id = 201
+group = 'while_and_if'
+number = 6
+visible = True
+
+solution = '''\
+artiklov = 0
+vsota = 0
+cena = 1
+while cena != 0 and vsota < 100 and artiklov < 10:
+    cena = int(input('Cena: '))
+    vsota += cena
+    artiklov += 1
+
+if cena == 0:
+    artiklov -= 1
+
+print('Porabili boste', vsota, 'evrov za', artiklov, 'stvari.')
+'''
+
+hint_type = {
+    'printing': Hint('printing'),
+    'while_clause': Hint('while_clause'),
+    'nonumber': Hint('nonumber'),
+    'while_condition': Hint('while_condition'),
+    'final_hint': Hint('final_hint'),
+    'summation': Hint('final_hint'),
+    'counting': Hint('final_hint'),
+}
+
+def test(python, code):
+    # List of inputs: (expression to eval, stdin).
+    test_in = [
+        (None, '10\n5\n0\n'),
+        (None, '10\n5\n90\n'),
+        (None, '10\n5\n90\n1\n1\n0\n'),
+        (None, '1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n'),
+        (None, '1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n'),
+        (None, '1\n1\n1\n1\n1\n1\n1\n1\n1\n0\n'),
+        (None, '0\n'),
+    ]
+
+    test_out = [
+        (15, 2),
+        (105, 3),
+        (105, 3),
+        (10, 10),
+        (10, 10),
+        (9, 9)
+    ]
+
+    # List of outputs: (expression result, stdout, stderr, exception).
+    answers = python(code=code, inputs=test_in, timeout=1.0)
+    outputs = [ans[1] for ans in answers]
+
+    n_correct = 0
+    tin = None
+    for i, (output, correct) in enumerate(zip(outputs, test_out)):
+        if all(string_almost_equal(output, correct[i]) for i in range(2)):
+            n_correct += 1
+        else:
+            tin = test_in[i][1]
+            tout = correct
+
+    passed = n_correct == len(test_in)
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_in)}}]
+    if tin:
+        hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin),
+                                                              'sum': str(tout[0]),
+                                                              'count': str(tout[1]),
+                                                              }})
+    if passed:
+        hints.append({'id': 'final_hint'})
+    return passed, hints
+
+def hint(python, code):
+    tokens = get_tokens(code)
+
+    # run one test first to see if there are any exceptions
+    test_in = [(None, '10\n5\n0\n'),
+               (None, '10\n5\n90\n'),
+               (None, '2\n2\n2\n2\n2\n2\n2\n2\n2\n2\n')]
+
+    answer = python(code=code, inputs=test_in, timeout=1.0)
+    exc = get_exception_desc(answer[0][3])
+    if exc:
+        if 'NameError' in answer[0][3]:
+            return [{'id':'name_error', 'args': {'message': answer[0][3]}}]
+        if 'EOFError' in answer[0][3]:
+            exc.append({'id' : 'while_condition'})
+            return exc
+        else:
+            return exc
+
+    # student does not have while or for: instruct him on loops
+    if not has_token_sequence(tokens, ['while']) and \
+       not has_token_sequence(tokens, ['for']):
+        return [{'id' : 'while_clause'}]
+
+    # student is not using print function
+    if not has_token_sequence(tokens, ['print']):
+        return [{'id' : 'printing'}]
+
+    # student does not print any values
+    if not get_numbers(answer[0][1]):
+        return [{'id' : 'nonumber'}]
+
+    # student's answer is not correct (three possibilities)
+    if not string_almost_equal(answer[0][1], 15) or \
+       not string_almost_equal(answer[0][2], 105) or \
+       not string_almost_equal(answer[0][3], 20):
+        return [{'id' : 'summation'}]
+
+    # student's answer is not correct (three possibilities)
+    if not string_almost_equal(answer[0][1], 2) or \
+       not string_almost_equal(answer[0][2], 3) or \
+       not string_almost_equal(answer[0][3], 10):
+        return [{'id' : 'counting'}]
+
+    return None
diff --git a/python/problems/while_and_if/consumers_anonymous/en.py b/python/problems/while_and_if/consumers_anonymous/en.py
new file mode 100644
index 0000000..bfac1ba
--- /dev/null
+++ b/python/problems/while_and_if/consumers_anonymous/en.py
@@ -0,0 +1,16 @@
+# coding=utf-8
+
+id = 201
+name = '(translation missing)'
+slug = '(translation missing)'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/while_and_if/consumers_anonymous/sl.py b/python/problems/while_and_if/consumers_anonymous/sl.py
new file mode 100644
index 0000000..5666216
--- /dev/null
+++ b/python/problems/while_and_if/consumers_anonymous/sl.py
@@ -0,0 +1,116 @@
+# coding=utf-8
+import server
+mod = server.problems.load_language('python', 'sl')
+
+id = 201
+name = 'Klub anonimnih potrošnikov'
+slug = 'Klub anonimnih potrošnikov'
+
+
+description = '''\
+<p>Razpas trgovin je pripeljal do zasvojenosti z nakupovanjem. Ena od metod zdravljenja
+temelji na inteligentnih košaricah, ki sprejmejo največ deset artiklov; po tem se zaklenejo
+in jih lahko kupec le še odnese na blagajno. Prav tako se zaklenejo,
+če cena artiklov doseže (ali preseže) 100 evrov.</p>
+
+<p>Napiši program, ki mu uporabnik vnaša cene in ki se neha izvajati,
+ko uporabnik vnese 0 (ne bo več kupoval),
+ko je vnešenih deset števil ali ko vsota cen doseže ali preseže 100 evrov.</p>
+
+<pre>
+Cena: 10
+Cena: 5
+Cena: 0
+Porabili boste 15 evrov za 2 stvari.
+</pre>
+<p>Pazite, uporabnik je kupil dve stvari, čeprav je vnesel tri cene!</p>
+
+<pre>
+Cena: 10
+Cena: 5
+Cena: 90
+Porabili boste 105 evrov za 3 stvari.
+
+Cena: 1
+Cena: 1
+Cena: 1
+Cena: 1
+Cena: 1
+Cena: 1
+Cena: 1
+Cena: 1
+Cena: 1
+Cena: 1
+Porabili boste 10 evrov za 10 stvari.
+</pre>
+'''
+
+main_plan = ['''\
+<p><b>Plan</b> 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>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>''',
+                   '''\
+<pre>
+cena != 0 and vsota < 100 and artiklov < 10
+</pre>
+''']
+
+
+plan = [main_plan,
+        while_condition]
+
+while_clause = ['''\
+<p>Uporabi zanko <while</p>''',
+         '''\
+<pre>
+while Pogoj:
+    stavek 1
+    stavek 2
+    ...
+stavek n # stavek izven while.
+</pre>''',
+         '''\
+<p>Stavki znotraj while (zamaknjeni) se izvajajo toliko časa, dokler velja <code>Pogoj</code>.
+Ko pogoj ne velja več, Python preskoči vrstice, ki so del while-a in nadaljuje s stavki, ki sledijo – v
+našem primeru s stavkom n.</p>'''
+        ]
+
+hint = {
+    'while_clause': while_clause,
+
+    'while_condition': while_condition,
+
+    'printing': ['''\
+<p>Izpiši rezultat!</p>'''],
+
+    'nonumber': ['''<p>Izpiši vsoto in število produktov.<p>'''],
+
+    'summation': ['''<p>Seštevanje cen ne deluje pravilno.<p>'''],
+
+    'counting': ['''<p>Napaka pri štetju stvari.<p>'''],
+
+    'name_error' : [mod.general_msg['error_head'],
+                    mod.general_msg['general_exception'],
+                    mod.general_msg['name_error'],
+                    '''\
+<p>Verjetno v pogoju uporabljaš nedefinirano spremenljivko.'''],
+
+    'problematic_test_case': ['''\
+<p>Zaporedje cen, kjer program ne dela prav: [%=testin%]<br>
+Pravilna vsota [%=sum%], pravilno število stvari: [%=count%]'''],
+
+    'final_hint': ['''\
+<p><b>Odlično!</b>Naloga rešena.</p>
+Še zanimivost: v while zanki smo negirali ustavitveni pogoj tako, da smo negirali posamezne pogoje in
+spremenili pogoj <code>or</code> v <code>and</code>. Temu pravimo De Morganov zakon.
+''']
+
+}
diff --git a/python/problems/while_and_if/minimax/common.py b/python/problems/while_and_if/minimax/common.py
new file mode 100644
index 0000000..6155024
--- /dev/null
+++ b/python/problems/while_and_if/minimax/common.py
@@ -0,0 +1,118 @@
+# coding=utf-8
+
+from python.util import has_token_sequence, string_almost_equal, \
+    string_contains_number, get_tokens, get_numbers, get_exception_desc
+from server.hints import Hint, HintSequence
+
+id = 199
+group = 'while_and_if'
+number = 4
+visible = True
+
+solution = '''\
+cena = 1
+vsota, eltov = 0, 0
+min_cena, max_cena = 100, 0
+while cena != 0:
+    cena = int(input("Cena: "))
+    vsota += cena
+    eltov += 1
+    if cena < min_cena and cena > 0:
+        min_cena = cena
+    if cena > max_cena:
+        max_cena = cena
+
+if eltov > 1:
+    pov = vsota / (eltov - 1)
+print (vsota, pov, min_cena, max_cena)
+'''
+
+hint_type = {
+    'printing': Hint('printing'),
+    'while_clause': Hint('while_clause'),
+    'nonumber': Hint('nonumber'),
+    'while_condition': Hint('while_condition'),
+    'average': Hint('while_condition'),
+}
+
+def test(python, code):
+    # List of inputs: (expression to eval, stdin).
+    test_in = [
+        (None, '2\n4\n1\n0\n'),
+        (None, '1\n1\n1\n1\n1\n0\n'),
+        (None, '1\n2\n0\n'),
+        (None, '5\n4\n3\n11\n7\n0\n'),
+        (None, '0\n'),
+    ]
+
+    test_out = [
+        (7, 2.333, 1, 4),
+        (5, 1, 1, 1),
+        (3, 1.5, 1, 2),
+        (30, 6, 3, 11),
+        (0, 0, 0, 0),
+    ]
+
+    # List of outputs: (expression result, stdout, stderr, exception).
+    answers = python(code=code, inputs=test_in, timeout=1.0)
+    outputs = [ans[1] for ans in answers]
+
+    n_correct = 0
+    tin = None
+    for i, (output, correct) in enumerate(zip(outputs, test_out)):
+        if all(string_almost_equal(output, correct[i]) for i in range(4)):
+            n_correct += 1
+        else:
+            tin = test_in[i][1]
+            tout = correct
+
+    passed = n_correct == len(test_in)
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_in)}}]
+    if tin:
+        hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin),
+                                                              'sum': str(tout[0]),
+                                                              'avg': str(tout[1]),
+                                                              'min': str(tout[2]),
+                                                              'max': str(tout[3])}})
+    return passed, hints
+
+def hint(python, code):
+    tokens = get_tokens(code)
+
+    # run one test first to see if there are any exceptions
+    test_in = [(None, '1\n1\n1\n1\n1\n0\n')]
+    answer = python(code=code, inputs=test_in, timeout=1.0)
+    exc = get_exception_desc(answer[0][3])
+    if exc:
+        if 'NameError' in answer[0][3]:
+            return [{'id':'name_error', 'args': {'message': answer[0][3]}}]
+        else:
+            return exc
+
+    # student does not have while or for: instruct him on loops
+    if not has_token_sequence(tokens, ['while']) and \
+       not has_token_sequence(tokens, ['for']):
+        return [{'id' : 'while_clause'}]
+
+    # student is not using division, therefore computing no average
+    if not has_token_sequence(tokens, ['/']):
+        return [{'id' : 'average'}]
+
+    # student is not computing max and min values.
+    if not has_token_sequence(tokens, ['<']) and \
+       not has_token_sequence(tokens, ['>']):
+        return [{'id' : 'minimax'}]
+
+    # student is not using print function
+    if not has_token_sequence(tokens, ['print']):
+        return [{'id' : 'printing'}]
+
+    # student does not print any values
+    if not get_numbers(answer[0][1]):
+        return [{'id' : 'nonumber'}]
+
+    # student's answer is not correct
+    if not string_almost_equal(answer[0][1], 5):
+        return [{'id' : 'while_condition'}]
+
+    return None
diff --git a/python/problems/while_and_if/minimax/en.py b/python/problems/while_and_if/minimax/en.py
new file mode 100644
index 0000000..0c86f5f
--- /dev/null
+++ b/python/problems/while_and_if/minimax/en.py
@@ -0,0 +1,16 @@
+# coding=utf-8
+
+id = 200
+name = '(translation missing)'
+slug = '(translation missing)'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/while_and_if/minimax/sl.py b/python/problems/while_and_if/minimax/sl.py
new file mode 100644
index 0000000..a76bd2e
--- /dev/null
+++ b/python/problems/while_and_if/minimax/sl.py
@@ -0,0 +1,113 @@
+# coding=utf-8
+import server
+mod = server.problems.load_language('python', 'sl')
+
+id = 199
+name = 'Blagajna "minimax"'
+slug = 'Blagajna "minimax"'
+
+
+description = '''\
+<p>Popravite prejšnji program tako, da poleg vsote in povprečne cene izpiše še najnižjo in najvišjo ceno.</p>
+<pre>
+Cena artikla: 2
+Cena artikla: 4
+Cena artikla: 1
+Cena artikla: 0
+Vsota: 7
+Poprečna cena: 2.33333333333
+Najnižja cena: 1
+Najvišja cena: 4
+</pre>
+'''
+
+main_plan = ['''\
+<p><b>Plan:</b></p>
+<pre>
+1. Ponavljaj dokler je cena večja od 0:
+    2. Preberi ceno.
+    3. Prištej vsoti.
+    4. Posodobi najmanjšo in največjo ceno.
+4. Izpiši vsoto, povprečje, najmanjšo in največjo vrednost.
+</pre>''']
+
+while_condition = ['''\
+<p>Koliko korakov naj naredi zanka?</p>''',
+                   '''\
+<p>Ne vemo, koliko korakov naj naredi zanka. Vemo pa,
+kdaj se bo zanka ustavila: ko bo cena enaka 0!</p>'''
+                   '''\
+<pre>
+while cena != 0:
+    ...
+</pre>'''
+]
+
+minimax = ['''\
+<p>V vsaki iteraciji posodobi največjo in najmanjšo ceno</p>''',
+           '''\
+<p>Če je trenutna cena manjša od najmanjše, potem je to nova najmanjša ...</p>''',
+           '''\
+<pre>
+if cena < min_cena:
+    min_cena = cena
+</pre>'''
+]
+
+plan = [main_plan,
+        while_condition,
+        minimax]
+
+while_clause = ['''\
+<p>Uporabi zanko <while</p>''',
+         '''\
+<pre>
+while Pogoj:
+    stavek 1
+    stavek 2
+    ...
+stavek n # stavek izven while.
+</pre>''',
+         '''\
+<p>Stavki znotraj while (zamaknjeni) se izvajajo toliko časa, dokler velja <code>Pogoj</code>.
+Ko pogoj ne velja več, Python preskoči vrstice, ki so del while-a in nadaljuje s stavki, ki sledijo – v
+našem primeru s stavkom n.</p>'''
+        ]
+
+hint = {
+    'while_clause': while_clause,
+
+    'while_condition': while_condition,
+
+    'average': ['''\
+<p>Formula za povprečje: povp = vsota / št.elementov</p>''',
+                '''\
+<p>Vsoto že znamo izračunati, za št. elementov pa potrebujemo števec.'''],
+
+    'printing': ['''\
+<p>Izpiši rezultat!</p>''',
+                 '''\
+<p> V Pythonu izpisujemo s funkcijo <code>print</code>. <p>''',
+'''<p>Pazi, da stavek s <code>print</code> ne bo zamaknjen, saj bo v takem
+primeru del while-a in se bo večkrat izpisal. </p>'''],
+
+    'nonumber': ['''<p>Izpiši vsoto<p>'''],
+
+    'minimax': minimax,
+
+    'name_error' : [mod.general_msg['error_head'],
+                    mod.general_msg['general_exception'],
+                    mod.general_msg['name_error'],
+                    '''\
+<p>Verjetno v pogoju uporabljaš nedefinirano spremenljivko.''',
+                    '''\
+<pre>
+cena = 1
+while cena != 0:
+    ...'''],
+
+    'problematic_test_case': ['''\
+<p>Zaporedje cen, kjer program ne dela prav: [%=testin%]<br>
+Pravilna vsota [%=sum%], pravilno povprečje: [%=avg%], min: [%=min%], max: [%=max%]</p>''']
+
+}
diff --git a/python/problems/while_and_if/top_shop/common.py b/python/problems/while_and_if/top_shop/common.py
index 5e8c951..db98212 100644
--- a/python/problems/while_and_if/top_shop/common.py
+++ b/python/problems/while_and_if/top_shop/common.py
@@ -27,6 +27,7 @@ hint_type = {
     'while_condition': Hint('while_condition'),
     'average': Hint('while_condition'),
     'final_hint': Hint('final_hint'),
+    'minimax': Hint('minimax')
 }
 
 def test(python, code):
@@ -54,8 +55,7 @@ def test(python, code):
     n_correct = 0
     tin = None
     for i, (output, correct) in enumerate(zip(outputs, test_out)):
-        if string_almost_equal(output, correct[0]) and \
-           string_almost_equal(output, correct[1]):
+        if all(string_almost_equal(output, correct[i]) for i in range(2)):
             n_correct += 1
         else:
             tin = test_in[i][1]
@@ -66,7 +66,8 @@ def test(python, code):
     if tin:
         hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin),
                                                               'sum': str(tout[0]),
-                                                              'avg': str(tout[1])}})
+                                                              'avg': str(tout[1]),
+                                                              }})
     if n_correct == len(test_in): # add an iteresting hint
         tokens = get_tokens(code)
         if has_token_sequence(tokens, ['!=', '0.', ':']):
diff --git a/python/problems/while_and_if/top_shop/sl.py b/python/problems/while_and_if/top_shop/sl.py
index 7eada34..ee9d02d 100644
--- a/python/problems/while_and_if/top_shop/sl.py
+++ b/python/problems/while_and_if/top_shop/sl.py
@@ -29,7 +29,7 @@ main_plan = ['''\
 1. Ponavljaj dokler je cena večja od 0:
     2. Preberi ceno.
     3. Prištej vsoti.
-4. Izpiši vsoto.
+4. Izpiši vsoto in povprečje.
 </pre>''']
 
 while_condition = ['''\
@@ -94,7 +94,7 @@ while cena != 0:
     ...'''],
 
     'final_hint': ['''\
-<p>Kaj bi moral narediti, da bi število -1 pomenilo konec?</p>''',
+<p><b>Odlično!</b> Kaj bi pa moral narediti, da bi število -1 pomenilo konec?</p>''',
                    '''\
 <p>Spremeniti pogoj in paziti,
 da se vrednost -1 ne prišteje vsoti!</p>'''],