Merge branch 'master' of ssh://212.235.189.51:22122/codeq-problems

Conflicts:
	robot/problems/introduction/forward/en.py
	robot/problems/introduction/forward/sl.py

3 files changed, 173 insertions, 0 deletions

diff --git a/python/problems/lists_and_for/places/common.py b/python/problems/lists_and_for/places/common.py
new file mode 100644
index 0000000..e7d1adf
--- /dev/null
+++ b/python/problems/lists_and_for/places/common.py
@@ -0,0 +1,80 @@
+# 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 = 218
+number = 4
+visible = True
+
+solution = '''\
+xs = [42, 5, 4, -7, 2, 12, -3, -4, 11, 42, 2]
+
+mesta = []
+for i in range(len(xs)):
+    if xs[i] == 42:
+        mesta.append(i)
+print(mesta)
+'''
+
+hint_type = {
+    'final_hint': Hint('final_hint')
+}
+
+def test(python, code):
+    in_out = [
+        ([], []),
+        ([0], []),
+        ([42], [0]),
+        ([4, 2], []),
+        ([42, 42], [0, 1]),
+        ([1, 2, 3, 4, 5, 5, 4, 3, 2, 1], []),
+        ([1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 42], [10]),
+        ([1, 2, 3, 4, 5, 42, 5, 4, 3, 2, 1], [5]),
+        ([1, 2, 42, 4, 5, 42, 5, 4, 42, 2, 1], [2, 5, 8]),
+        ([42, 5, 4, -7, 2, 12, -3, -4, 11, 42, 2], [0, 9]),
+        ([42] * 10, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]),
+    ]
+
+    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)
+    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/places/en.py b/python/problems/lists_and_for/places/en.py
new file mode 100644
index 0000000..95b119f
--- /dev/null
+++ b/python/problems/lists_and_for/places/en.py
@@ -0,0 +1,16 @@
+# coding=utf-8
+
+id = 218
+name = 'Places'
+slug = 'Places'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/lists_and_for/places/sl.py b/python/problems/lists_and_for/places/sl.py
new file mode 100644
index 0000000..5a435a0
--- /dev/null
+++ b/python/problems/lists_and_for/places/sl.py
@@ -0,0 +1,77 @@
+# coding=utf-8
+import server
+mod = server.problems.load_language('python', 'sl')
+
+
+id = 218
+name = 'Mesta'
+slug = 'Mesta'
+
+
+description = '''\
+<p>
+Program naj sestavi seznam vseh mest, na katerih se v podanem seznamu pojavi število 42.
+Za seznam iz prve naloge
+<pre>
+xs = [42, 5, 4, -7, 2, 12, -3, -4, 11, 42, 2]
+</pre>
+naj vaš program izpiše [0, 9], saj se število 42 pojavi na ničtem in devetem mestu (če začnemo šteti z 0).
+</p>'''
+
+empty_list = ['''\
+<p>Nov, prazen seznam ustvarimo s stavkom: </p>
+<pre>
+s = []
+</pre>
+''']
+
+enumerate_function = ['''\
+<p> Uporabi funkcijo <code>enumerate</code>.
+</p>
+''',
+    '''\
+<pre>
+for index, val in enumerate(xs):
+    print index, v
+</pre>''',
+    '''\
+<p>V zgornji <code>for</code>zanki se v spremenljivko <code>val</code> zapiše 
+trenutni element v seznamu <code>xs</code>, v spremenljivki <code>indeks</code>
+pa je zapisano mesto oz. indeks trenutnega elementa. </p>''']
+
+append_method = [
+        '''\
+<p>V seznam dodamo nov element z metodo <code>append</code>.</p>''',
+        '''\
+<p>Poskusi: </p>
+<pre>
+s = []
+s.append(3)
+s.append(5)
+print (s)
+</pre>''']
+
+plan = ['''\
+<p>S <code>for</code> zanko pojdi čez seznam. Ko naletiš na 42, dodaj mesto trenutnega elementa
+v nov seznam. </p>
+''',
+        '''\
+<p>
+<pre>
+Ustvari prazen seznam mest
+Za vsak element v seznamu
+    Ali je 42?
+        Če je, dodaj trenutno mesto v seznam mest
+Izpiši seznam mest
+</pre>
+</p>''',
+        empty_list,
+        enumerate_function,
+        append_method]
+
+hint = {
+    'final_hint': ['''\
+<p>Program je pravilen! <br>
+</p>
+'''],
+}