1 files changed, 30 insertions, 22 deletions

diff --git a/python/problems/introduction/average/common.py b/python/problems/introduction/average/common.py
index 0a2b689..c84ef72 100644
--- a/python/problems/introduction/average/common.py
+++ b/python/problems/introduction/average/common.py
@@ -1,28 +1,30 @@
 # coding=utf-8
 
-from python.util import has_token_sequence, string_almost_equal
+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, HintSequence
 
+
 id = 189
 group = 'introduction'
-number = 2
+number = 4
 visible = True
 
 solution = '''\
 a = float(input('Ocena [Ana]? '))
 b = float(input('Ocena [Benjamin]? '))
 c = float(input('Ocena [Cilka]? '))
-print('Povpre?je:', (a + b + c) / 3)
+print('Povprečje:', (a + b + c) / 3)
 print('Srednja vrednost:', a + b + c - min(a, b, c) - max( a, b, c))
 '''
 
 hint_type = {
     'plan': Hint('plan'),
     'eval_expression': Hint('eval_expression'),
-    'name_error': HintSequence('name_error', 4),
-    'unsupported_operand': HintSequence('unsupported_operand', 4),
-    'error': HintSequence('error', 2),
-    'radians': HintSequence('radians', 3),
+    'name_error': Hint('name_error'),
+    'unsupported_operand': Hint('unsupported_operand'),
+    'error': Hint('error'),
+    'radians': Hint('radians'),
     'printing': Hint('printing'),
 }
 
@@ -47,47 +49,53 @@ def test(python, code):
     ]
 
     # List of outputs: (expression result, stdout, stderr, exception).
+    print ("ena")
     answers = python(code=code, inputs=test_in, timeout=1.0)
     outputs = [ans[1] for ans in answers]
 
     n_correct = 0
-    for output, c in zip(outputs, test_out):
-        if string_almost_equal(output, c[0]) and \
-           string_almost_equal(output, c[1]):
+    tin = None
+    print (outputs)
+    print (test_out)
+    for i, (output, correct) in enumerate(zip(outputs, test_out)):
+        if string_almost_equal(output, correct[0]) and \
+           string_almost_equal(output, correct[1]):
             n_correct += 1
+        else:
+            tin = test_in[i][1].replace('\n', ' ')
+            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)}})
     return passed, hints
 
+
 def hint(python, code):
+    tokens = get_tokens(code)
+
     # run one test first to see if there are any exceptions
     test_in = [(None, '1\n1\n4\n')]
     answer = python(code=code, inputs=test_in, timeout=1.0)
     exc = answer[0][3]
-    # if have an exception!
+    exc_hint = get_exception_desc(answer[0][3])
     if exc:
         if 'NameError' in exc:
             return [{'id':'name_error', 'args': {'message': exc}}]
         elif 'TypeError' in exc:
             return [{'id':'type_error', 'args': {'message': exc}}]
         else:
-            return [{'id':'error', 'args': {'message': exc}}]
-
-    # show plan if student is lost
-    # a) empty progam
-    # b) there is not input (we can do it here, since we have no input hint)
-    if not code or (not has_token_sequence(code, ['input'])):
-        return [{'id': 'plan'}]
+            return exc_hint
 
     # Help to compute average (if /3 is not program)
-    if not has_token_sequence(code, ['/', '3']):
+    if not has_token_sequence(tokens, ['/', '3']):
         return [{'id': 'average'}]
 
     # If student is not using functions min or max, then he is
     # not computing median in the right way
-    if not has_token_sequence(code, ['min']) or \
-       not has_token_sequence(code, ['max']):
+    if not has_token_sequence(tokens, ['min']) or \
+       not has_token_sequence(tokens, ['max']):
         return [{'id': 'median'}]
 
     # program is working correctly for mean but not for median
@@ -95,7 +103,7 @@ def hint(python, code):
         return [{'id': 'median'}]
 
     # student is not using print function
-    if not has_token_sequence(code, ['print']):
+    if not has_token_sequence(tokens, ['print']):
         return [{'id' : 'printing'}]
 
     return None