Merge remote-tracking branch 'origin/master'

3 files changed, 208 insertions, 0 deletions

diff --git a/python/problems/comprehensions/morse/common.py b/python/problems/comprehensions/morse/common.py
new file mode 100644
index 0000000..785862e
--- /dev/null
+++ b/python/problems/comprehensions/morse/common.py
@@ -0,0 +1,113 @@
+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 = 20705
+number = 5
+visible = True
+
+solution = '''\
+morse = {
+    'A': '.-',
+    'B': '-...',
+    'C': '-.-.',
+    'D': '-..',
+    'E': '.',
+    'F': '..-.',
+    'G': '--.',
+    'H': '....',
+    'I': '..',
+    'J': '.---',
+    'K': '-.-',
+    'L': '.-..',
+    'M': '--',
+    'N': '-.',
+    'O': '---',
+    'P': '.--.',
+    'Q': '--.-',
+    'R': '.-.',
+    'S': '...',
+    'T': '-',
+    'U': '..-',
+    'V': '...-',
+    'W': '.--',
+    'X': '-..-',
+    'Y': '-.--',
+    'Z': '--..',
+    '1': '.----',
+    '2': '..---',
+    '3': '...--',
+    '4': '....-',
+    '5': '.....',
+    '6': '-....',
+    '7': '--...',
+    '8': '---..',
+    '9': '----.',
+    '0': '-----',
+    ' ': ''
+}
+
+def txt2morse(s):
+    return ' '.join(morse[c] for c in s)
+'''
+
+hint_type = {
+    'final_hint': Hint('final_hint'),
+    'no_comprehension': Hint('no_comprehension'),
+    'has_loop': Hint('has_loop')
+}
+
+def test(python, code):
+    func_name = 'txt2morse'
+    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 = [
+        ('TE A', '- .  .-'),
+        ('HELLO WORLD', '.... . .-.. .-.. ---  .-- --- .-. .-.. -..'),
+        ('THE QUICK BROWN FOX JUMPED OVER THE LAZY DOGS BACK 1234567890',
+         '- .... .  --.- ..- .. -.-. -.-  -... .-. --- .-- -.  ..-. --- -..-  .--- ..- -- .--. . -..  --- ...- . .-.  - .... .  .-.. .- --.. -.--  -.. --- --. ...  -... .- -.-. -.-  .---- ..--- ...-- ....- ..... -.... --... ---.. ----. -----'),
+    ]
+
+    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/morse/en.py b/python/problems/comprehensions/morse/en.py
new file mode 100644
index 0000000..cc55165
--- /dev/null
+++ b/python/problems/comprehensions/morse/en.py
@@ -0,0 +1,13 @@
+id = 20705
+name = 'Morse code'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/comprehensions/morse/sl.py b/python/problems/comprehensions/morse/sl.py
new file mode 100644
index 0000000..4c4a7a1
--- /dev/null
+++ b/python/problems/comprehensions/morse/sl.py
@@ -0,0 +1,82 @@
+import server
+mod = server.problems.load_language('python', 'sl')
+
+
+id = 20705
+name = 'Morsejeva abeceda'
+
+description = '''\
+<p>
+Napišite funkcijo <code>txt2morse</code>, ki pretvori sporočilo v
+Morsejevo abecedo. </p>
+<p>
+Morsejeva abeceda izgleda takole: </p>
+<pre>
+'A': '.-',
+'B': '-...',
+'C': '-.-.',
+'D': '-..',
+'E': '.',
+'F': '..-.',
+'G': '--.',
+'H': '....',
+'I': '..',
+'J': '.---',
+'K': '-.-',
+'L': '.-..',
+'M': '--',
+'N': '-.',
+'O': '---',
+'P': '.--.',
+'Q': '--.-',
+'R': '.-.',
+'S': '...',
+'T': '-',
+'U': '..-',
+'V': '...-',
+'W': '.--',
+'X': '-..-',
+'Y': '-.--',
+'Z': '--..',
+'1': '.----',
+'2': '..---',
+'3': '...--',
+'4': '....-',
+'5': '.....',
+'6': '-....',
+'7': '--...',
+'8': '---..',
+'9': '----.',
+'0': '-----',
+</pre>
+
+<p>Primer:
+<pre>
+>>> txt2morse('TE A')
+'- .  .-'
+>>> txt2morse('HELLO WORLD')
+'.... . .-.. .-.. ---  .-- --- .-. .-.. -..'
+</pre>
+</p>
+'''
+
+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>
+'''],
+
+}