5 files changed, 93 insertions, 3 deletions
diff --git a/python/problems/hw-fkkt/hw2/common.py b/python/problems/hw-fkkt/hw2/common.py
new file mode 100644
index 0000000..70f306e
--- /dev/null
+++ b/python/problems/hw-fkkt/hw2/common.py
@@ -0,0 +1,67 @@
+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
+import re
+
+id = 25051
+number = 2
+visible = True
+
+solution = '''\
+'''
+
+hint_type = {
+    'final_hint': Hint('final_hint'),
+}
+
+def test(python, code, aux_code=''):
+    # List of inputs: (expression to eval, stdin).
+    test_in = [
+        (None, '50'),
+		(None, '100'),
+		(None, '32\n37.4'),
+		(None, '32\n36.9\nne vem'),
+        (None, '32\n36\nne'),
+        (None, '32\n36\nda\nne vem'),
+        (None, '32\n36\nda\nda'),
+        (None, '32\n36\nda\nne\nne vem'),
+        (None, '32\n36\nda\nne\nne'),
+        (None, '32\n36\nda\nne\nda'),
+    ]
+    test_out = [
+		'V1',
+        'V1',
+		'V2',
+		'Neveljaven vnos',
+        'N1',
+		'Neveljaven vnos',
+        'V3',
+		'Neveljaven vnos',
+        'N2',
+        'V4',
+    ]
+
+    # 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 correct.lower() in output.rstrip().split('\n')[-1].lower():
+            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=''):
+	#return [{'id' : 'no_hints'}]
+    return None
diff --git a/python/problems/hw-fkkt/hw2/sl.py b/python/problems/hw-fkkt/hw2/sl.py
new file mode 100644
index 0000000..b481554
--- /dev/null
+++ b/python/problems/hw-fkkt/hw2/sl.py
@@ -0,0 +1,23 @@
+import server
+mod = server.problems.load_language('python', 'sl')
+
+name = 'Druga domača naloga'
+slug = 'Druga domača naloga'
+
+description = '''\
+<p>Navodila so objavljena na <a href="https://ucilnica.fri.uni-lj.si/course/view.php?id=239" target="_blank">spletni učilnici</a>.</p>'''
+
+
+plan = []
+
+hint = {
+    'no_hints' : [
+            "<p>Domače naloge ne vsebujejo namigov!</p>"
+    ],
+
+
+    'final_hint' : [
+            '''\
+<p>Odlično, program deluje na vseh testih!</p>
+''']
+}
diff --git a/python/problems/lists_and_if-fkkt/contains_number/common.py b/python/problems/lists_and_if-fkkt/contains_number/common.py
index b20d7b9..0601f49 100644
--- a/python/problems/lists_and_if-fkkt/contains_number/common.py
+++ b/python/problems/lists_and_if-fkkt/contains_number/common.py
@@ -4,7 +4,7 @@ from python.util import has_token_sequence, string_almost_equal, \
 from server.hints import Hint
 
 id = 25006
-number = 2
+number = 3
 visible = True
 
 solution = '''\
diff --git a/python/problems/lists_and_if-fkkt/contains_word/common.py b/python/problems/lists_and_if-fkkt/contains_word/common.py
index 1c4843c..aed2a9e 100644
--- a/python/problems/lists_and_if-fkkt/contains_word/common.py
+++ b/python/problems/lists_and_if-fkkt/contains_word/common.py
@@ -4,7 +4,7 @@ from python.util import has_token_sequence, string_almost_equal, \
 from server.hints import Hint
 
 id = 25007
-number = 3
+number = 2
 visible = True
 
 solution = '''\
diff --git a/python/problems/lists_and_if-fkkt/temp_converter/common.py b/python/problems/lists_and_if-fkkt/temp_converter/common.py
index 1b41ef1..0fe68e7 100644
--- a/python/problems/lists_and_if-fkkt/temp_converter/common.py
+++ b/python/problems/lists_and_if-fkkt/temp_converter/common.py
@@ -66,7 +66,7 @@ def test(python, code, aux_code=''):
 
 def hint(python, code, aux_code=''):
     # run one test first to see if there are any exceptions
-    test_in = [(None, '1\n')]
+    test_in = [(None, '32\nK\n')]
     answer = python(code=aux_code+code, inputs=test_in, timeout=1.0)
     exc = get_exception_desc(answer[0][3])
     if exc: return exc