Merge remote-tracking branch 'origin/master'

3 files changed, 128 insertions, 0 deletions

diff --git a/python/problems/comprehensions/isbn/common.py b/python/problems/comprehensions/isbn/common.py
new file mode 100644
index 0000000..4724713
--- /dev/null
+++ b/python/problems/comprehensions/isbn/common.py
@@ -0,0 +1,76 @@
+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 = 20707
+number = 7
+visible = True
+
+solution = '''\
+def valid(isbn):
+    return len(isbn) == 10 and sum((10 if c == 'X' else int(c)) * (10 - i) for i, c in enumerate(isbn)) % 11 == 0
+'''
+
+hint_type = {
+    'final_hint': Hint('final_hint'),
+    'no_comprehension': Hint('no_comprehension'),
+    'has_loop': Hint('has_loop')
+}
+
+def test(python, code):
+    func_name = 'valid'
+    tokens = get_tokens(code)
+    ast = get_ast(code)
+    if not has_token_sequence(tokens, ['def', func_name]):
+        return False, [{'id' : 'no_func_name', 'args' : {'func_name' : func_name}}]
+
+    in_out = [
+        ('0306406152', True),
+        ('0553382578', True),
+        ('0553293370', True),
+        ('912115628X', True),
+        ('03064061522', False),
+        ('1553382578', False),
+        ('91211562811', False),
+    ]
+
+    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=code, inputs=test_in, timeout=1.0)
+    n_correct = 0
+    tin, tout = None, None
+    for i, (ans, to) in enumerate(zip(answers, test_out)):
+        corr = ans[0] == 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:
+        if not has_comprehension(ast):
+            hints.append({'id': 'no_comprehension'})
+        elif has_loop(ast):
+            hints.append({'id': 'has_loop'})
+        else:
+            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
+    answer = python(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/comprehensions/isbn/en.py b/python/problems/comprehensions/isbn/en.py
new file mode 100644
index 0000000..638042c
--- /dev/null
+++ b/python/problems/comprehensions/isbn/en.py
@@ -0,0 +1,13 @@
+id = 20707
+name = 'ISBN'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/comprehensions/isbn/sl.py b/python/problems/comprehensions/isbn/sl.py
new file mode 100644
index 0000000..7805aae
--- /dev/null
+++ b/python/problems/comprehensions/isbn/sl.py
@@ -0,0 +1,39 @@
+import server
+mod = server.problems.load_language('python', 'sl')
+
+
+id = 20707
+name = 'ISBN'
+
+description = '''\
+<p>
+Napišite funkcijo <code>valid(isbn)</code>, ki preveri ali je podan ISBN
+<a href="http://en.wikipedia.org/wiki/Check_digit#ISBN_10">veljaven</a>.</p>
+<pre>
+>>> valid('0306406152'), valid('0553382578'), valid('0553293370'), valid('912115628X') # primer veljavnih ...
+(True, True, True, True)
+>>> valid('03064061522'), valid('1553382578'), valid('91211562811') # ... in neveljavnih ISBN.
+(False, False, False)
+</pre>
+'''
+
+plan = []
+
+hint = {
+    'final_hint': ['''\
+<p>Program je pravilen! <br>
+</p>
+'''],
+
+    'no_comprehension': ['''\
+<p>Program je sicer pravilen, vendar ne vsebuje izpeljanih seznamov ali
+generatorjev...
+</p>
+'''],
+
+    'has_loop': ['''\
+<p>Program je sicer pravilen, vendar vsebuje zanko.
+</p>
+'''],
+
+}