2 files changed, 193 insertions, 0 deletions
diff --git a/python/problems/introduction-fkkt/pythagorean_theorem_fkkt/common.py b/python/problems/introduction-fkkt/pythagorean_theorem_fkkt/common.py
new file mode 100644
index 0000000..cb78487
--- /dev/null
+++ b/python/problems/introduction-fkkt/pythagorean_theorem_fkkt/common.py
@@ -0,0 +1,100 @@
+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 = 25002
+number = 3
+visible = True
+
+solution = '''\
+from math import *
+a = float(input("Prva kateta: "))
+b = float(input("Druga kateta: "))
+c = sqrt(a ** 2 + b ** 2)
+print("Hipotenuza trikotnika s stranicama", a, "in", b, "je", c)
+'''
+
+hint_type = {
+    'plan': Hint('plan'),
+    'name_error': Hint('name_error'),
+    'unsupported_operand': Hint('unsupported_operand'),
+    'no_input_call' : Hint('no_input_call'),
+    'printing': Hint('printing'),
+    'math_functions': Hint('math_functions'),
+    'final_hint': Hint('final_hint')
+}
+
+def test(python, code, aux_code=''):
+    # List of inputs: (expression to eval, stdin).
+    test_in = [
+        (None, '3\n4\n'),
+        (None, '4\n3\n'),
+        (None, '12\n5\n'),
+        (None, '5\n12\n'),
+        (None, '5\n0\n'),
+        (None, '0\n5\n'),
+    ]
+
+    test_out = [
+        "Hipotenuza = 5.0 cm",
+        "Hipotenuza = 5.0 cm",
+        "Hipotenuza = 13.0 cm",
+        "Hipotenuza = 13.0 cm",
+        "Hipotenuza = 5.0 cm",
+        "Hipotenuza = 5.0 cm",
+    ]
+
+    # 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):
+        #if string_almost_equal(output, float(correct), prec=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), '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
+    test_in = [(None, '3\n4\n')]
+    answer = python(code=aux_code+code, inputs=test_in, timeout=1.0)
+    exc = answer[0][3]
+    exc_hint = get_exception_desc(answer[0][3])
+    if exc:
+        if 'NameError' in exc:
+            return [{'id':'name_error', 'args': {'message': exc}}]
+        elif 'unsupported operand' in exc or 'TypeError' in exc:
+            return [{'id':'unsupported_operand', 'args': {'message': exc}}]
+        else:
+            return exc_hint
+
+    # if input is not present in code, student needs to learn about input
+    if not has_token_sequence(tokens, ['input']) or \
+       (not has_token_sequence(tokens, ['float']) and not has_token_sequence(tokens, ['int'])) or \
+       not has_token_sequence(tokens, ['=']):
+        return [{'id': 'no_input_call'}]
+
+    # if tokens sqrt or ** are not in code, we have to teach them how to 
+    # use math functions.
+    if not has_token_sequence(tokens, ['**']):
+        return [{'id' : 'math_functions'}]
+
+    # student is not using print function
+    if not has_token_sequence(tokens, ['print']):
+        return [{'id' : 'printing'}]
+
+    return None
diff --git a/python/problems/introduction-fkkt/pythagorean_theorem_fkkt/sl.py b/python/problems/introduction-fkkt/pythagorean_theorem_fkkt/sl.py
new file mode 100644
index 0000000..e94e87a
--- /dev/null
+++ b/python/problems/introduction-fkkt/pythagorean_theorem_fkkt/sl.py
@@ -0,0 +1,93 @@
+import server
+mod = server.problems.load_language('python', 'sl')
+
+name = 'Pitagorov izrek'
+slug = 'Pitagorov izrek'
+
+description = '''\
+<p>Napiši program, ki uporabnika vpraša po dolžinah katet pravokotnega trikotnika in
+izpiše dolžino hipotenuze.</p>
+<p>Primer uporabe:</p>    
+<pre>Prva kateta [cm]: 3
+Druga kateta [cm]: 4
+Hipotenuza = 5.0 cm</pre>
+'''
+
+no_input_call = ['''\
+<p>Tako kot pri prejšnji nalogi za branje uporabimo funkcijo <code>input</code></p>''',
+                 '''\
+<p>Preberemo dve vrednosti in jih shranimo v dve spremenljivki:</p>
+<pre>
+ a = float(input("Prva kateta: "))
+ b = float(input("Druga kateta: "))
+</pre>''',
+                '''\
+<p> Imeni <code>a</code> in <code>b</code> sta spremenljivki (angl. variable).
+Spremenljivke uporabljamo, kadar želimo kakšno vrednost shraniti, ki jo bomo
+potrebovali kasneje v programu. Imena spremenljivk so lahko poljubno
+ dolga, v našem primeru bi jim lahko rekli tudi <code>kateta_a</code> in <code>kateta_b</code>.
+ Pri programiranju velja, da izbiramo taka imena spremenljivk,
+ ki bodo naredila program berljiv. </p>
+ '''
+]
+
+math_functions =  ['''\
+<p>Dolžina hipotenuze je kvadratni koren vsote kvadratov katet.</p>''',
+                   '''\
+<pre>
+c = (a**2 + b**2)**(1/2)
+</pre>
+<p>Dvojni znak za množenje ** je potenciranje. Potenca 1/2 pomeni koren. '''
+]
+
+printing = ['''\
+<p> V Pythonu izpisujemo s funkcijo <code>print</code>. </p>''',
+            '''\
+<p>Če želimo izpisati več elementov,
+jih ločimo z vejico.  Recimo, da imamo spremenljivko <code>ime</code>,
+ki vsebuje naše ime, potem lahko napišemo:</p>
+<pre>
+print("Ime mi je", ime, ".")
+</pre>''']
+
+plan = ['''\
+<p>Program razdelimo na tri dele:</p>
+<ol>
+    <li>Preberi vrednosti katet (a,b = ?)</li>
+    <li>Izračunaj dolžino hipotenuze c (c = …)</li>
+    <li>Izpis dolžine hipotenuze (print … )</li>
+</ol>
+''',
+        no_input_call,
+        math_functions,
+        printing]
+
+hint = {
+    'no_input_call': no_input_call,
+
+    'math_functions': math_functions,
+
+    'printing': printing,
+
+    'name_error' : [mod.general_msg['error_head'], mod.general_msg['general_exception'],
+    mod.general_msg['name_error'], '''
+    <p>Verjetno uporabljaš spremenljivko, ki nima vrednosti. Ali v izrazu za izračun
+     uporabljaš napačno spremenljivko? Ali pri izpisu morda poskušaš
+     izpisati napačno spremenljivko?</p>'''],
+
+    'unsupported_operand' : [mod.general_msg['error_head'], mod.general_msg['general_exception'],
+    mod.general_msg['type_error'], '''
+<p>Verjetni razlog: funkcija <code>input</code> vrača vrednost tipa niz,
+ki jo moramo najprej pretvoriti v tip <code>float</code>, če želimo z njo računati:</p>
+<pre>
+v = float(input(" ...
+</pre>
+'''],
+
+    'final_hint' : [
+        '''\
+<p>Program deluje pravilno! <br>
+To pomeni, da znaš prebrati števila in na njih uporabljati matematične operacije.
+</p>''']
+
+}