From 2f9730ef664c2e61fd25abba8fcd1a335b9884c4 Mon Sep 17 00:00:00 2001 From: Martin Date: Fri, 18 Sep 2015 14:04:04 +0200 Subject: Added general text of exceptions to sl.py Added Buy five problem. --- python/problems/while_and_if/buy_five/common.py | 75 ++++++++++++++ python/problems/while_and_if/buy_five/en.py | 16 +++ python/problems/while_and_if/buy_five/sl.py | 131 ++++++++++++++++++++++++ 3 files changed, 222 insertions(+) create mode 100644 python/problems/while_and_if/buy_five/common.py create mode 100644 python/problems/while_and_if/buy_five/en.py create mode 100644 python/problems/while_and_if/buy_five/sl.py (limited to 'python/problems') diff --git a/python/problems/while_and_if/buy_five/common.py b/python/problems/while_and_if/buy_five/common.py new file mode 100644 index 0000000..586e50a --- /dev/null +++ b/python/problems/while_and_if/buy_five/common.py @@ -0,0 +1,75 @@ +# coding=utf-8 + +from python.util import has_token_sequence, string_almost_equal, \ + string_contains_number, get_tokens +from server.hints import Hint, HintSequence + +id = 185 +group = 'while_and_if' +number = 1 +visible = True + +solution = '''\ +vsota = 0 +i = 0 +while i < 5: + vsota += int(input('Cena artikla: ')) + i += 1 +print('Vsota:', vsota) +''' + +hint_type = { + 'plan': HintSequence('plan', 5), + 'name_error': Hint('name_error'), + 'type_error': Hint('name'), + 'error': Hint('error'), + 'printing': Hint('printing'), +} + +def test(python, code): + # List of inputs: (expression to eval, stdin). + test_in = [ + (None, '1\n1\n1\n1\n1\n'), + (None, '1\n2\n3\n4\n5\n'), + (None, '1\n2\n0\n3\n-1\n'), + (None, '5\n4\n3\n11\n7\n'), + (None, '0\n0\n0\n0\n0\n'), + ] + + test_out = [ + 5, + 15, + 5, + 29, + 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 + for output, correct in zip(outputs, test_out): + if string_contains_number(output, correct): + n_correct += 1 + return n_correct, len(test_in) + +def hint(python, code): + # run one test first to see if there are any exceptions + test_in = [(None, '1\n1\n1\n1\n1\n')] + answer = python(code=code, inputs=test_in, timeout=1.0) + exc = answer[0][3] + # if have an exception! + 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}}] + + # student is not using print function + if not has_token_sequence(code, ['print']): + return [{'id' : 'printing'}] + + return None diff --git a/python/problems/while_and_if/buy_five/en.py b/python/problems/while_and_if/buy_five/en.py new file mode 100644 index 0000000..b09ee17 --- /dev/null +++ b/python/problems/while_and_if/buy_five/en.py @@ -0,0 +1,16 @@ +# coding=utf-8 + +id = 185 +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/buy_five/sl.py b/python/problems/while_and_if/buy_five/sl.py new file mode 100644 index 0000000..88d00b7 --- /dev/null +++ b/python/problems/while_and_if/buy_five/sl.py @@ -0,0 +1,131 @@ +# coding=utf-8 +import server +server.problems.load_language('python', 'sl') + +id = 185 +name = 'Blagajna "vse po pet"' +slug = 'Blagajna "vse po pet"' + +description = '''\ +

V trgovini "vse po pet" morajo stranke vedno kupiti natanko pet artiklov. Za blagajne zato potrebujejo +programsko opremo, ki uporabnika (blagajnika) vpraša po petih cenah; ko jih le-ta vnese, program +izpiše vsoto.

+
+Cena artikla: 2
+Cena artikla: 4
+Cena artikla: 1
+Cena artikla: 6
+Cena artikla: 3
+Vsota: 16
+
+''' + +bad_solution = ['''\ +

Slaba rešitev:

+
+cena1 = float(input('Cena artikla: '))
+cena2 = float(input('Cena artikla: '))
+cena3 = float(input('Cena artikla: '))
+cena4 = float(input('Cena artikla: '))
+cena5 = float(input('Cena artikla: '))
+vsota = cena1+cena2+cena3+cena4+cena5
+print ("Vsota: " + vsota)
+
''', + '''\ +

Rešitev je slaba, saj imamo pet enakih vrstic! Ponavljanje programske kode +pa velja za slabo prakso. Bolje bo, če uporabimo zanke.

'''] + +plan = ['''\ +

Plan

+

Ponavljaj 5x:

+
    +
  1. Preberi ceno
  2. +
  3. Prištej vstoti
  4. +
+

Izpiši vsoto

'''] + +while_clause = ['''\ +

Kako bi prebrali 5 cen z uporabo zanke while?

''', + '''\ +

Zanka while ima naslednjo sintakso:

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

Stavki znotraj while (ki so zamaknjeni) se izvajajo toliko časa, dokler velja Pogoj v glavi stavka while. +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.

''' + ] + +reading_while = ['''\ +

Za večkratno branje želimo uporabiti zanko:

''', + +'''\ +
+while ____:
+cena = float(input('Cena artikla: '))
+
+

Kakšen je pogoj?

''', + +'''\ +Izmisliti si moramo pogoj, ki bo resničen 5 korakov, potem pa ne +več. Običajni trik v takih primerih je uporaba števca. ''', + +'''\ +Števec je spremenljivka, ki se v zanki vsakič poveča za ena - torej šteje''', + +'''\ +
+stevec = 0
+while _________:
+    cena = float(input('Cena artikla: '))
+    stevec += 1
+
+

Imaš zdaj morda idejo, kakšen naj bo pogoj?

''', + +'''\ +
+while stevec < 5:
+
+'''] + +summation = ['''\ +

Računanje vsote bo najlažje sproti v zanki.

''', + +'''\ +

Izmisli si spremenljivko, ki bo predstavljala vsoto, jo na +začetku (pred zanko) nastavi na 0 in ji v vsakem koraku prištej trenutno ceno. +Podobno kot števec.

''' +] + + +hint = { + 'plan':[bad_solution, + plan, + while_clause, + reading_while, + summation], + + 'printing': [''' +

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.

'''], + + 'name_error' : [general_msg['error_head'], + general_msg['general'], + general_msg['name_error'], + '''\ +

Verjetno uporabljate spremenljivko, ki nima nastavljene vrednosti.''', + '''\ +

Morda v pogoju uporabljate spremeljivko, ki ni definirana

'''], + + 'type_error' : [general_exception['error_head'], + general_exception['general'], + general_exception['type_error']], + + 'error' : [general_exception['error_head'], general_exception['general'],] +} -- cgit v1.2.1