From fc7d6323fbdb776cfdba3cd58dc14048c39b8078 Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 28 Sep 2015 14:46:01 +0200 Subject: Fixed errors in top shop problem. --- python/problems/while_and_if/buy_five/sl.py | 3 +- python/problems/while_and_if/top_shop/common.py | 110 ++++++++++++++++++++++++ python/problems/while_and_if/top_shop/en.py | 16 ++++ python/problems/while_and_if/top_shop/sl.py | 106 +++++++++++++++++++++++ 4 files changed, 234 insertions(+), 1 deletion(-) create mode 100644 python/problems/while_and_if/top_shop/common.py create mode 100644 python/problems/while_and_if/top_shop/en.py create mode 100644 python/problems/while_and_if/top_shop/sl.py diff --git a/python/problems/while_and_if/buy_five/sl.py b/python/problems/while_and_if/buy_five/sl.py index 0b5479d..682edaf 100644 --- a/python/problems/while_and_if/buy_five/sl.py +++ b/python/problems/while_and_if/buy_five/sl.py @@ -42,7 +42,8 @@ main_plan = ['''\ 1. Ponavljaj 5x: 2. Preberi ceno. 3. Prištej vsoti. -4. Izpiši vsoto.'''] +4. Izpiši vsoto. +'''] while_clause = ['''\

Kako bi nekaj 5x ponovil?

''', diff --git a/python/problems/while_and_if/top_shop/common.py b/python/problems/while_and_if/top_shop/common.py new file mode 100644 index 0000000..5e8c951 --- /dev/null +++ b/python/problems/while_and_if/top_shop/common.py @@ -0,0 +1,110 @@ +# coding=utf-8 + +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 = 198 +group = 'while_and_if' +number = 3 +visible = True + +solution = '''\ +cena = 1 +stevec, vsota = 0, 0 +while cena != 0: + cena = int(input("Cena: ")) + vsota += cena + stevec += 1 +print('Vsota:', vsota) +print('Povprečje: ', vsota / stevec) +''' + +hint_type = { + 'printing': Hint('printing'), + 'while_clause': Hint('while_clause'), + 'nonumber': Hint('nonumber'), + 'while_condition': Hint('while_condition'), + 'average': Hint('while_condition'), + 'final_hint': Hint('final_hint'), +} + +def test(python, code): + # List of inputs: (expression to eval, stdin). + test_in = [ + (None, '2\n4\n1\n0\n'), + (None, '1\n1\n1\n1\n1\n0\n'), + (None, '1\n2\n0\n'), + (None, '5\n4\n3\n11\n7\n0\n'), + (None, '0\n'), + ] + + test_out = [ + (7, 2.333), + (5, 1), + (3, 1.5), + (30, 6), + (0, 0), + ] + + # List of outputs: (expression result, stdout, stderr, exception). + answers = python(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 string_almost_equal(output, correct[0]) and \ + string_almost_equal(output, correct[1]): + 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), + 'sum': str(tout[0]), + 'avg': str(tout[1])}}) + if n_correct == len(test_in): # add an iteresting hint + tokens = get_tokens(code) + if has_token_sequence(tokens, ['!=', '0.', ':']): + 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 + test_in = [(None, '1\n1\n1\n1\n1\n0\n')] + answer = python(code=code, inputs=test_in, timeout=1.0) + exc = get_exception_desc(answer[0][3]) + if exc: + if 'NameError' in answer[0][3]: + return [{'id':'name_error', 'args': {'message': answer[0][3]}}] + else: + return exc + + # student does not have while or for: instruct him on loops + if not has_token_sequence(tokens, ['while']) and \ + not has_token_sequence(tokens, ['for']): + return [{'id' : 'while_clause'}] + + # student is not using division, therefore computing no average + if not has_token_sequence(tokens, ['/']): + return [{'id' : 'average'}] + + # student is not using print function + if not has_token_sequence(tokens, ['print']): + return [{'id' : 'printing'}] + + # student does not print any values + if not get_numbers(answer[0][1]): + return [{'id' : 'nonumber'}] + + # student's answer is not correct + if not string_almost_equal(answer[0][1], 5): + return [{'id' : 'while_condition'}] + + return None diff --git a/python/problems/while_and_if/top_shop/en.py b/python/problems/while_and_if/top_shop/en.py new file mode 100644 index 0000000..9dc9090 --- /dev/null +++ b/python/problems/while_and_if/top_shop/en.py @@ -0,0 +1,16 @@ +# coding=utf-8 + +id = 198 +name = '(translation missing)' +slug = '(translation missing)' + +description = '''\ +

(translation missing)

''' + +hint = { + 'plan': '''\ +

(translation missing)

''', + + 'no_input_call': '''\ +

(translation missing)

''', +} diff --git a/python/problems/while_and_if/top_shop/sl.py b/python/problems/while_and_if/top_shop/sl.py new file mode 100644 index 0000000..7eada34 --- /dev/null +++ b/python/problems/while_and_if/top_shop/sl.py @@ -0,0 +1,106 @@ +# coding=utf-8 +import server +mod = server.problems.load_language('python', 'sl') + +id = 198 +name = 'Blagajna "top shop"' +slug = 'Blagajna "top shop"' + + +description = '''\ +

Tretja trgovina se je odločila, da bo konkurirala drugi tako, da bo imela na blagajnah krajše vrste kot +druga, pri kateri se plačevanje odvija počasi zato, ker morajo blagajniki prešteti izdelke preden lahko +začnejo vnašati njihove cene. Popravi program tako, da ne vpraša po številu izdelkov, temveč sprašuje +po cenah toliko časa, dokler mu blagajnik ne vnese ničle. Program naj na koncu izpiše tudi povprečno +ceno.

+
+Cena artikla: 2
+Cena artikla: 4
+Cena artikla: 1
+Cena artikla: 0
+Vsota: 7
+Poprečna cena: 2.33333333333
+
+''' + +main_plan = ['''\ +

Plan:

+
+1. Ponavljaj dokler je cena večja od 0:
+    2. Preberi ceno.
+    3. Prištej vsoti.
+4. Izpiši vsoto.
+
'''] + +while_condition = ['''\ +

Koliko korakov naj naredi zanka?

''', + '''\ +

Ne vemo, koliko korakov naj naredi zanka. Vemo pa, +kdaj se bo zanka ustavila: ko bo cena enaka 0!

''' + '''\ +
+while cena != 0:
+    ...
+
''' +] + +plan = [main_plan, + while_condition] + +while_clause = ['''\ +

Uporabi zanko ''', + '''\ +

+while Pogoj:
+    stavek 1
+    stavek 2
+    ...
+stavek n # stavek izven while.
+
''', + '''\ +

Stavki znotraj while (zamaknjeni) se izvajajo toliko časa, dokler velja Pogoj. +Ko pogoj ne velja več, Python preskoči vrstice, ki so del while-a in nadaljuje s stavki, ki sledijo – v +našem primeru s stavkom n.

''' + ] + +hint = { + 'while_clause': while_clause, + + 'while_condition': while_condition, + + 'average': ['''\ +

Formula za povprečje: povp = vsota / št.elementov

''', + '''\ +

Vsoto že znamo izračunati, za št. elementov pa potrebujemo števec.'''], + + 'printing': ['''\ +

Izpiši rezultat!

''', + '''\ +

V Pythonu izpisujemo s funkcijo print.

''', +'''

Pazi, da stavek s print ne bo zamaknjen, saj bo v takem +primeru del while-a in se bo večkrat izpisal.

'''], + + 'nonumber': ['''

Izpiši vsoto

'''], + + 'name_error' : [mod.general_msg['error_head'], + mod.general_msg['general_exception'], + mod.general_msg['name_error'], + '''\ +

Verjetno v pogoju uporabljaš nedefinirano spremenljivko.''', + '''\ +

+cena = 1
+while cena != 0:
+    ...'''],
+
+    'final_hint': ['''\
+
Kaj bi moral narediti, da bi število -1 pomenilo konec?
''',
+                   '''\
+
Spremeniti pogoj in paziti,
+da se vrednost -1 ne prišteje vsoti!
'''],
+
+    'problematic_test_case': ['''\
+
Zaporedje cen, kjer program ne dela prav: [%=testin%]

+Pravilna vsota [%=sum%], pravilno povprečje: [%=avg%]
''']
+
+}
-- 
cgit v1.2.1