- new exercises on recursion

- added text (lectures) on conditions and loops

3 files changed, 115 insertions, 0 deletions

diff --git a/python/problems/recursion/sum/common.py b/python/problems/recursion/sum/common.py
new file mode 100644
index 0000000..9625a76
--- /dev/null
+++ b/python/problems/recursion/sum/common.py
@@ -0,0 +1,70 @@
+import re
+from python.util import has_token_sequence, string_almost_equal, \
+    string_contains_number, get_tokens, get_numbers, get_exception_desc, \
+    all_tokens, has_comprehension, has_loop, almost_equal, get_ast
+from server.hints import Hint
+
+id = 20807
+number = 7
+visible = True
+
+solution = '''\
+def sum(xs):
+    if not xs:
+        return 0
+    if isinstance(xs[0], list):
+        return sum(xs[0]) + sum(xs[1:])
+    return xs[0] + sum(xs[1:])
+'''
+
+hint_type = {
+    'final_hint': Hint('final_hint')
+}
+
+def test(python, code, aux_code=''):
+    func_name = 'sum'
+    tokens = get_tokens(code)
+    if not has_token_sequence(tokens, ['def', func_name]):
+        return False, [{'id' : 'no_func_name', 'args' : {'func_name' : func_name}}]
+
+    in_out = [
+        ([], 0),
+        ([1,2,3,4,5], 15),
+        ([1, [], [2, 3, [4]], 5], 15),
+        ([1, [], [2, 3, [4]], 5, [[[[10], 6], [[7], 9], 8]]], 55),
+    ]
+
+    test_in = [('{0}({1})'.format(func_name, str(l[0])), None)
+               for l in in_out]
+    test_out = [l[1] for l in in_out]
+
+    answers = python(code=aux_code+code, inputs=test_in, timeout=1.0)
+    n_correct = 0
+    tin, tout = None, None
+    for i, (ans, to) in enumerate(zip(answers, test_out)):
+        res = ans[0]
+        corr = res == to
+        n_correct += corr
+        if not corr:
+            tin = test_in[i][0]
+            tout = to
+
+    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), 'testout': str(tout)}})
+    if passed:
+        hints.append({'id': 'final_hint'})
+
+    return passed, hints
+
+
+def hint(python, code, aux_code=''):
+    tokens = get_tokens(code)
+
+    # run one test first to see if there are any exceptions
+    answer = python(code=aux_code+code, inputs=[(None, None)], timeout=1.0)
+    exc = get_exception_desc(answer[0][3])
+    if exc: return exc
+
+    return None
diff --git a/python/problems/recursion/sum/en.py b/python/problems/recursion/sum/en.py
new file mode 100644
index 0000000..a61f900
--- /dev/null
+++ b/python/problems/recursion/sum/en.py
@@ -0,0 +1,13 @@
+id = 20807
+name = 'Sum'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/recursion/sum/sl.py b/python/problems/recursion/sum/sl.py
new file mode 100644
index 0000000..e23bd97
--- /dev/null
+++ b/python/problems/recursion/sum/sl.py
@@ -0,0 +1,32 @@
+import server
+mod = server.problems.load_language('python', 'sl')
+
+id = 20807
+name = 'Vsota seznama'
+
+description = '''\
+<p>
+Napiši funkcijo <code>sum(xs)</code>, ki sešteje elemente vgnezdenega seznama xs.
+Pomagajte si s funkcijo isinstance.</p>
+<pre>
+>>> isinstance([1, 2, 3], list)
+True
+>>> isinstance(1, list)
+False
+>>> sum([])
+0
+>>> sum([1, 2, 3, 4, 5])
+15
+>>> sum([1, [], [2, 3, [4]], 5])
+15
+</pre>
+'''
+
+plan = []
+
+hint = {
+    'final_hint': ['''\
+<p>Program je pravilen! <br>
+</p>
+'''],
+}