From 84f3426c937d1bb9d44ba25a71706416fbb8b85d Mon Sep 17 00:00:00 2001
From: Martin
Date: Fri, 9 Oct 2015 11:17:49 +0200
Subject: Added several new problems.
They have no tests nor hints implemented.
---
.../problems/lists_and_for/every_third/common.py | 50 ++++++++++++++++++++++
python/problems/lists_and_for/every_third/en.py | 16 +++++++
python/problems/lists_and_for/every_third/sl.py | 35 +++++++++++++++
3 files changed, 101 insertions(+)
create mode 100644 python/problems/lists_and_for/every_third/common.py
create mode 100644 python/problems/lists_and_for/every_third/en.py
create mode 100644 python/problems/lists_and_for/every_third/sl.py
(limited to 'python/problems/lists_and_for/every_third')
diff --git a/python/problems/lists_and_for/every_third/common.py b/python/problems/lists_and_for/every_third/common.py
new file mode 100644
index 0000000..9c27446
--- /dev/null
+++ b/python/problems/lists_and_for/every_third/common.py
@@ -0,0 +1,50 @@
+# coding=utf-8
+
+import re
+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 = 220
+group = 'lists_and_for'
+number = 6
+visible = True
+
+solution = '''\
+xs = [42, 5, 4, -7, 2, 12, -3, -4, 11, 42, 2]
+
+ys = []
+i = 2
+while i < len(xs):
+ ys.append(xs[i])
+ i += 3
+print(ys)
+'''
+
+hint_type = {
+ 'final_hint': Hint('final_hint')
+}
+
+def test(python, code):
+ test_in = [1]
+ n_correct = 0
+
+ passed = n_correct == len(test_in)
+ tin = None
+ tout = None
+ 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):
+ tokens = get_tokens(code)
+
+ # run one test first to see if there are any exceptions
+ answer = python(code=code, inputs=[(None, None)], timeout=1.0)
+ exc = get_exception_desc(answer[0][3])
+ if exc: return exc
+
+ return None
diff --git a/python/problems/lists_and_for/every_third/en.py b/python/problems/lists_and_for/every_third/en.py
new file mode 100644
index 0000000..e7c843e
--- /dev/null
+++ b/python/problems/lists_and_for/every_third/en.py
@@ -0,0 +1,16 @@
+# coding=utf-8
+
+id = 220
+name = 'Every third'
+slug = 'Every third'
+
+description = '''\
+(translation missing)
'''
+
+hint = {
+ 'plan': '''\
+(translation missing)
''',
+
+ 'no_input_call': '''\
+(translation missing)
''',
+}
diff --git a/python/problems/lists_and_for/every_third/sl.py b/python/problems/lists_and_for/every_third/sl.py
new file mode 100644
index 0000000..3bac8a3
--- /dev/null
+++ b/python/problems/lists_and_for/every_third/sl.py
@@ -0,0 +1,35 @@
+# coding=utf-8
+import server
+mod = server.problems.load_language('python', 'sl')
+
+
+id = 220
+name = 'Vsak tretji'
+slug = 'Vsak tretji'
+
+
+description = '''\
+
+Napiši program, ki iz podanega seznama sestavi nov seznam, ki vsebuje le vsak tretji element podanega seznama.
+Kot dosedaj, naj se program začne z
+
+xs = [42, 5, 4, -7, 2, 12, -3, -4, 11, 42, 2]
+
+in (v tem primeru) izpiše
+
+[4, 12, 11]
+
+
'''
+
+plan = ['''\
+
+''',
+ '''\
+''']
+
+hint = {
+ 'final_hint': ['''\
+Program je pravilen!
+
+'''],
+}
--
cgit v1.2.1
From 95e107bf9e6a288969e4a83aee1a7062990f3b67 Mon Sep 17 00:00:00 2001
From: Martin
Date: Fri, 9 Oct 2015 16:35:23 +0200
Subject: Fixed testing for most problems.
---
.../problems/lists_and_for/every_third/common.py | 34 ++++++++++++++++++++--
1 file changed, 31 insertions(+), 3 deletions(-)
(limited to 'python/problems/lists_and_for/every_third')
diff --git a/python/problems/lists_and_for/every_third/common.py b/python/problems/lists_and_for/every_third/common.py
index 9c27446..6f42663 100644
--- a/python/problems/lists_and_for/every_third/common.py
+++ b/python/problems/lists_and_for/every_third/common.py
@@ -26,12 +26,40 @@ hint_type = {
}
def test(python, code):
- test_in = [1]
+ in_out = [
+ ([], []),
+ ([0], []),
+ ([0, 1], []),
+ ([0, 1, 2], [2]),
+ ([1, 2, 3, 4, 5, 5, 4, 3, 2, 1], [3, 5, 2]),
+ ([42, 5, 4, -7, 2, 12, -3, -4, 11, 42, 2], [4, 12, 11]),
+ (list(range(15)), [2, 5, 8, 11, 14])
+ ]
+
+ test_in = [t[0] for t in in_out]
+ test_out = [t[1] for t in in_out]
+
n_correct = 0
+ tin = None
+ for xs_i, xs in enumerate(test_in):
+ # change code to contain new xs instead of the one
+ # given by user
+ tcode = re.sub(r'^xs\s*=\s*\[.*?\]',
+ 'xs = ' + str(xs),
+ code,
+ flags = re.DOTALL | re.MULTILINE)
+ # use python session to call tcode
+ answers = python(code=tcode, inputs=[(None, None)], timeout=1.0)
+ output = answers[0][1]
+
+ if str(test_out[xs_i]) in output:
+ n_correct += 1
+ else:
+ tin = test_in[xs_i]
+ tout = test_out[xs_i]
passed = n_correct == len(test_in)
- tin = None
- tout = None
+
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)}})
--
cgit v1.2.1
From 6e281624b9a0ae29f1f1862f9d581b219ba3b95a Mon Sep 17 00:00:00 2001
From: Timotej Lazar
Date: Mon, 12 Oct 2015 11:46:08 +0200
Subject: Remove group attribute from problem common.py files
---
python/problems/lists_and_for/every_third/common.py | 1 -
1 file changed, 1 deletion(-)
(limited to 'python/problems/lists_and_for/every_third')
diff --git a/python/problems/lists_and_for/every_third/common.py b/python/problems/lists_and_for/every_third/common.py
index 6f42663..2d5b907 100644
--- a/python/problems/lists_and_for/every_third/common.py
+++ b/python/problems/lists_and_for/every_third/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
from server.hints import Hint
id = 220
-group = 'lists_and_for'
number = 6
visible = True
--
cgit v1.2.1
From 5a01c2bb184152c6ccc3c536e9b857d247bc55ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Mo=C5=BEina?=
Date: Mon, 12 Oct 2015 14:09:22 +0200
Subject: Added plans to problems.
---
python/problems/lists_and_for/every_third/sl.py | 49 ++++++++++++++++++++++++-
1 file changed, 47 insertions(+), 2 deletions(-)
(limited to 'python/problems/lists_and_for/every_third')
diff --git a/python/problems/lists_and_for/every_third/sl.py b/python/problems/lists_and_for/every_third/sl.py
index 3bac8a3..50b4520 100644
--- a/python/problems/lists_and_for/every_third/sl.py
+++ b/python/problems/lists_and_for/every_third/sl.py
@@ -21,11 +21,56 @@ in (v tem primeru) izpiše
'''
+empty_list = ['''\
+Nov, prazen seznam ustvarimo s stavkom:
+
+s = []
+
+''']
+
+enumerate_function = ['''\
+ Uporabi funkcijo enumerate
.
+
+''',
+ '''\
+
+for index, val in enumerate(xs):
+ print index, v
+
''',
+ '''\
+V zgornji for
zanki se v spremenljivko val
zapiše
+trenutni element v seznamu xs
, v spremenljivki indeks
+pa je zapisano mesto oz. indeks trenutnega elementa.
''']
+
+append_method = [
+ '''\
+V seznam dodamo nov element z metodo append
.
''',
+ '''\
+Poskusi:
+
+s = []
+s.append(3)
+s.append(5)
+print (s)
+
''']
+
plan = ['''\
-
+S for
zanko pojdi čez seznam. V novi seznam dodaj vsak tretji element.
''',
'''\
-''']
+
+
+Ustvari prazen seznam mest
+Za vsak element v seznamu
+ Ali je (mesto elementa + 1) deljivo s 3?
+ Če je, dodaj trenutno mesto v seznam mest
+Izpiši seznam mest
+
+''',
+ empty_list,
+ enumerate_function,
+ mod.general_msg["modulo"],
+ append_method]
hint = {
'final_hint': ['''\
--
cgit v1.2.1