From 84f3426c937d1bb9d44ba25a71706416fbb8b85d Mon Sep 17 00:00:00 2001
From: Martin <martin@leo.fri1.uni-lj.si>
Date: Fri, 9 Oct 2015 11:17:49 +0200
Subject: Added several new problems.

They have no tests nor hints implemented.
---
 .../functions_and_modules/similarity/common.py     | 48 ++++++++++++++++++++++
 .../functions_and_modules/similarity/en.py         | 16 ++++++++
 .../functions_and_modules/similarity/sl.py         | 39 ++++++++++++++++++
 3 files changed, 103 insertions(+)
 create mode 100644 python/problems/functions_and_modules/similarity/common.py
 create mode 100644 python/problems/functions_and_modules/similarity/en.py
 create mode 100644 python/problems/functions_and_modules/similarity/sl.py

(limited to 'python/problems/functions_and_modules/similarity')

diff --git a/python/problems/functions_and_modules/similarity/common.py b/python/problems/functions_and_modules/similarity/common.py
new file mode 100644
index 0000000..5cb8fe7
--- /dev/null
+++ b/python/problems/functions_and_modules/similarity/common.py
@@ -0,0 +1,48 @@
+# 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 = 236
+group = 'functions_and_modules'
+number = 2
+visible = True
+
+solution = '''\
+def similarity(s1, s2):
+    stevec = 0
+    for i in range(min(len(s1), len(s2))):
+        if s1[i] == s2[i]:
+            stevec += 1
+    return stevec
+'''
+
+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/functions_and_modules/similarity/en.py b/python/problems/functions_and_modules/similarity/en.py
new file mode 100644
index 0000000..e1dc014
--- /dev/null
+++ b/python/problems/functions_and_modules/similarity/en.py
@@ -0,0 +1,16 @@
+# coding=utf-8
+
+id = 236
+name = 'Similarity'
+slug = 'Similarity'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/functions_and_modules/similarity/sl.py b/python/problems/functions_and_modules/similarity/sl.py
new file mode 100644
index 0000000..8aaf0b0
--- /dev/null
+++ b/python/problems/functions_and_modules/similarity/sl.py
@@ -0,0 +1,39 @@
+# coding=utf-8
+import server
+mod = server.problems.load_language('python', 'sl')
+
+
+id = 236
+name = 'Podobnost'
+slug = 'Podobnost'
+
+
+description = '''\
+<p>
+Napišite funkcijo <code>similarity(s1, s2)</code>, ki izračuna podobnost med dvema nizoma.
+Podobnost definirajmo kot število mest v katerih se niza ujemata.
+<pre>
+sobota
+robot
+------
+011110 -> 4
+
+>>> podobnost('sobota', 'robot')
+4
+>>> podobnost('robot', 'sobota')
+4
+</pre>
+</p>'''
+
+plan = ['''\
+<p></p>
+''',
+        '''\
+<p></p>''']
+
+hint = {
+    'final_hint': ['''\
+<p>Program je pravilen! <br>
+</p>
+'''],
+}
-- 
cgit v1.2.1


From 95e107bf9e6a288969e4a83aee1a7062990f3b67 Mon Sep 17 00:00:00 2001
From: Martin <martin@leo.fri1.uni-lj.si>
Date: Fri, 9 Oct 2015 16:35:23 +0200
Subject: Fixed testing for most problems.

---
 .../functions_and_modules/similarity/common.py     | 32 ++++++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'python/problems/functions_and_modules/similarity')

diff --git a/python/problems/functions_and_modules/similarity/common.py b/python/problems/functions_and_modules/similarity/common.py
index 5cb8fe7..d71137e 100644
--- a/python/problems/functions_and_modules/similarity/common.py
+++ b/python/problems/functions_and_modules/similarity/common.py
@@ -24,12 +24,37 @@ hint_type = {
 }
 
 def test(python, code):
-    test_in = [1]
+    func_name = 'similarity'
+    tokens = get_tokens(code)
+    if not has_token_sequence(tokens, ['def', func_name]):
+        return False, [{'id' : 'no_func_name', 'args' : {'func_name' : func_name}}]
+
+    in_out = [
+        (('sobota', 'robot'), 4),
+        (('', 'robot'), 0),
+        (('sobota', ''), 0),
+        (('', ''), 0),
+        (('a', 'b'), 0),
+        (('a', 'a'), 1),
+        (('aaa', 'a'), 1),
+        (('amper', 'amonijak'), 2),
+        (('1000 let', 'tisoc let'), 0),
+        (('hamming distance', 'haming  distance'), 12)
+    ]
+
+    test_in = [(func_name+'(*%s)'%str(l[0]), None) for l in in_out]
+    test_out = [l[1] for l in in_out]
+
+    answers = python(code=code, inputs=test_in, timeout=1.0)
     n_correct = 0
+    tin, tout = None, None
+    for i, (ans, to) in enumerate(zip(answers, test_out)):
+        n_correct += ans[0] == to
+        if ans[0] != to:
+            tin = test_in[i][0]
+            tout = to
 
     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)}})
@@ -37,6 +62,7 @@ def test(python, code):
         hints.append({'id': 'final_hint'})
     return passed, hints
 
+
 def hint(python, code):
     tokens = get_tokens(code)
 
-- 
cgit v1.2.1


From 6e281624b9a0ae29f1f1862f9d581b219ba3b95a Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Mon, 12 Oct 2015 11:46:08 +0200
Subject: Remove group attribute from problem common.py files

---
 python/problems/functions_and_modules/similarity/common.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'python/problems/functions_and_modules/similarity')

diff --git a/python/problems/functions_and_modules/similarity/common.py b/python/problems/functions_and_modules/similarity/common.py
index d71137e..3a6df99 100644
--- a/python/problems/functions_and_modules/similarity/common.py
+++ b/python/problems/functions_and_modules/similarity/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
 from server.hints import Hint
 
 id = 236
-group = 'functions_and_modules'
 number = 2
 visible = True
 
-- 
cgit v1.2.1