From cde24bbc3aec6ce17b8947fd80042419f2e54e6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matev=C5=BE=20Pober=C5=BEnik?= <tevzpoberznik@gmail.com>
Date: Mon, 23 Oct 2017 18:03:59 +0200
Subject: Add new exercices for FKKT - lists and if

---
 .../lists_and_if-fkkt/contains_number/common.py    | 88 ++++++++++++++++++++++
 .../lists_and_if-fkkt/contains_number/sl.py        | 49 ++++++++++++
 2 files changed, 137 insertions(+)
 create mode 100644 python/problems/lists_and_if-fkkt/contains_number/common.py
 create mode 100644 python/problems/lists_and_if-fkkt/contains_number/sl.py

(limited to 'python/problems/lists_and_if-fkkt/contains_number')

diff --git a/python/problems/lists_and_if-fkkt/contains_number/common.py b/python/problems/lists_and_if-fkkt/contains_number/common.py
new file mode 100644
index 0000000..b20d7b9
--- /dev/null
+++ b/python/problems/lists_and_if-fkkt/contains_number/common.py
@@ -0,0 +1,88 @@
+import re
+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
+
+id = 25006
+number = 2
+visible = True
+
+solution = '''\
+seznam = [3, 7, 9, 10, 12]
+st = int(input("Vpišite število: "))
+if st in seznam:
+    print("Seznam vsebuje število", st)
+else:
+    print("Seznam ne vsebuje števila", st)
+'''
+
+hint_type = {
+    'no_xs': Hint('no_xs'),
+    'if_clause': Hint('if_clause'),
+    'printing': Hint('printing'),
+    'no_input_call' : Hint('no_input_call'),
+    'final_hint': Hint('final_hint')
+}
+
+def test(python, code, aux_code=''):
+    tokens = get_tokens(code)
+
+    test_in = [
+        (None, '9\n'),
+        (None, '4\n'),
+        (None, '3\n'),
+        (None, '1\n')
+    ]
+    test_out = [
+        'Seznam vsebuje število 9',
+        'Seznam ne vsebuje števila 4',
+        'Seznam vsebuje število 3',
+        'Seznam ne vsebuje števila 1'
+    ]
+
+    # List of outputs: (expression result, stdout, stderr, exception).
+    answers = python(code=aux_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 output.rstrip().endswith(correct):
+            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 != None:
+        hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin), 'testout': str(tout)}})
+    else:
+        hints.append({'id' : 'final_hint'})
+    return passed, hints
+
+def hint(python, code, aux_code=''):
+    # run one test first to see if there are any exceptions
+    test_in = [(None, '1\n')]
+    answer = python(code=aux_code+code, inputs=test_in, timeout=1.0)
+    exc = get_exception_desc(answer[0][3])
+    if exc: return exc
+
+    tokens = get_tokens(code)
+
+    # if has no xs, tell him to ask for values
+    if not has_token_sequence(tokens, ['seznam', '=', '[']):
+        return [{'id' : 'no_xs'}]
+
+    # if input is not present in code, student needs to learn about input
+    if not has_token_sequence(tokens, ['input']):
+        return [{'id': 'no_input_call'}]
+
+    if not has_token_sequence(tokens, ['if']):
+        return [{'id' : 'if_clause'}]
+
+    # student is not using print function
+    if not has_token_sequence(tokens, ['print']):
+        return [{'id' : 'printing'}]
+
+    return None
diff --git a/python/problems/lists_and_if-fkkt/contains_number/sl.py b/python/problems/lists_and_if-fkkt/contains_number/sl.py
new file mode 100644
index 0000000..69b9c7c
--- /dev/null
+++ b/python/problems/lists_and_if-fkkt/contains_number/sl.py
@@ -0,0 +1,49 @@
+import server
+mod = server.problems.load_language('python', 'sl')
+
+
+name = 'Števila v seznamu'
+slug = 'Števila v seznamu'
+
+
+description = '''\
+<p>Napišite program, ki ugotovi, ali je število, ki ga vpiše uporabnik, v seznamu. Seznam definirajte na vrhu programa: <code>seznam = [3, 7, 9, 10, 12, 17, 21, 33]</code><br>
+Primer uporabe:</p>
+
+<pre><code>Vpišite število: <span style="color: rgb(239, 69, 64);">9</span>
+Seznam vsebuje število 9
+
+Vpišite število: <span style="color: rgb(239, 69, 64);">4</span>
+Seznam ne vsebuje števila 4
+</code></pre>
+
+<p>Seveda mora program delati za poljubne sezname in ne samo za seznam iz primera.</p>
+'''
+
+if_clause = ['''\
+<p>Preveri, ali imamo dano število v seznamu?</p>''',
+             '''\
+<p>Uporabi pogojni stavek <code>if</code>!</p>''',
+             '''\
+<pre>
+if x in seznam:
+</pre>''']
+
+
+plan = []
+
+hint = {
+    'no_xs': ['''\
+<p>Program mora imeti na začetku definiran seznam <code>seznam</code>.</p>'''],
+
+    'no_input_call': '''<p>Za branje uporabimo funkcijo <code>input</code></p>''',
+
+    'if_clause': if_clause,
+
+    'printing': ['''\
+<p>Izpiši rezultat.</p>'''],
+
+    'final_hint': ['''\
+<p>Program deluje pravilno!</p>'''],
+
+}
-- 
cgit v1.2.1