Added three problems to while and if section.

3 files changed, 258 insertions, 0 deletions

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.
+''']
+
+}