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.
---
python/problems/lists_and_for/substrings/common.py | 51 ++++++++++++++++++++++
python/problems/lists_and_for/substrings/en.py | 16 +++++++
python/problems/lists_and_for/substrings/sl.py | 33 ++++++++++++++
3 files changed, 100 insertions(+)
create mode 100644 python/problems/lists_and_for/substrings/common.py
create mode 100644 python/problems/lists_and_for/substrings/en.py
create mode 100644 python/problems/lists_and_for/substrings/sl.py
(limited to 'python/problems/lists_and_for/substrings')
diff --git a/python/problems/lists_and_for/substrings/common.py b/python/problems/lists_and_for/substrings/common.py
new file mode 100644
index 0000000..32a3d4c
--- /dev/null
+++ b/python/problems/lists_and_for/substrings/common.py
@@ -0,0 +1,51 @@
+# 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 = 223
+group = 'lists_and_for'
+number = 9
+visible = True
+
+solution = '''\
+s = input('Vpiši besedo: ')
+
+xs = ['']
+# Zanka po dolžini podniza.
+for i in range(1, len(s) + 1):
+ # Zanka po začetku podniza.
+ for j in range(len(s) - i + 1):
+ xs.append(s[j:j + i])
+print(xs)
+'''
+
+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/substrings/en.py b/python/problems/lists_and_for/substrings/en.py
new file mode 100644
index 0000000..053bee4
--- /dev/null
+++ b/python/problems/lists_and_for/substrings/en.py
@@ -0,0 +1,16 @@
+# coding=utf-8
+
+id = 223
+name = 'Substrings'
+slug = 'Substrings'
+
+description = '''\
+(translation missing)
'''
+
+hint = {
+ 'plan': '''\
+(translation missing)
''',
+
+ 'no_input_call': '''\
+(translation missing)
''',
+}
diff --git a/python/problems/lists_and_for/substrings/sl.py b/python/problems/lists_and_for/substrings/sl.py
new file mode 100644
index 0000000..595aee8
--- /dev/null
+++ b/python/problems/lists_and_for/substrings/sl.py
@@ -0,0 +1,33 @@
+# coding=utf-8
+import server
+mod = server.problems.load_language('python', 'sl')
+
+
+id = 223
+name = 'Podnizi'
+slug = 'Podnizi'
+
+
+description = '''\
+
+Program naj sestavi seznam vseh podnizov podane besede.
+
+Vpiši besedo: tema
+['', 't', 'e', 'm', 'a', 'te', 'em', 'ma', 'tem', 'ema', 'tema']
+
+Vrstni red naj bo točno tak kot ga prikazuje primer. Začnemo s praznim nizom,
+nato pridejo na vrsto podnizi dolžine ena, dva, tri, ...
+
'''
+
+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.
---
python/problems/lists_and_for/substrings/common.py | 24 +++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
(limited to 'python/problems/lists_and_for/substrings')
diff --git a/python/problems/lists_and_for/substrings/common.py b/python/problems/lists_and_for/substrings/common.py
index 32a3d4c..bdc356a 100644
--- a/python/problems/lists_and_for/substrings/common.py
+++ b/python/problems/lists_and_for/substrings/common.py
@@ -27,12 +27,30 @@ hint_type = {
}
def test(python, code):
- test_in = [1]
+ in_out = [
+ ('a', ['', 'a']),
+ ('ab', ['', 'a', 'b', 'ab']),
+ ('abc', ['', 'a', 'b', 'c', 'ab', 'bc', 'abc']),
+ ('tema', ['', 't', 'e', 'm', 'a', 'te', 'em', 'ma', 'tem', 'ema', 'tema']),
+ ]
+
+ test_in = [(None, s[0]+'\n') for s in in_out]
+ test_out = [str(s[1]) for s in in_out]
+ # 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 correct in output:
+ n_correct += 1
+ else:
+ tin = test_in[i][1]
+ tout = correct
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/substrings/common.py | 1 -
1 file changed, 1 deletion(-)
(limited to 'python/problems/lists_and_for/substrings')
diff --git a/python/problems/lists_and_for/substrings/common.py b/python/problems/lists_and_for/substrings/common.py
index bdc356a..8128797 100644
--- a/python/problems/lists_and_for/substrings/common.py
+++ b/python/problems/lists_and_for/substrings/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
from server.hints import Hint
id = 223
-group = 'lists_and_for'
number = 9
visible = True
--
cgit v1.2.1