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.
---
 python/problems/functions/prime_numbers/common.py | 49 +++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 python/problems/functions/prime_numbers/common.py

(limited to 'python/problems/functions/prime_numbers/common.py')

diff --git a/python/problems/functions/prime_numbers/common.py b/python/problems/functions/prime_numbers/common.py
new file mode 100644
index 0000000..0447c61
--- /dev/null
+++ b/python/problems/functions/prime_numbers/common.py
@@ -0,0 +1,49 @@
+# 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 = 234
+group = 'functions'
+number = 13
+visible = True
+
+solution = '''\
+def prime(n):
+    for i in range(2, n):
+        for j in range(2, i):
+            if i % j == 0:
+                break
+        else:
+            print(i)
+'''
+
+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
-- 
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.

---
 python/problems/functions/prime_numbers/common.py | 27 ++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'python/problems/functions/prime_numbers/common.py')

diff --git a/python/problems/functions/prime_numbers/common.py b/python/problems/functions/prime_numbers/common.py
index 0447c61..6806a08 100644
--- a/python/problems/functions/prime_numbers/common.py
+++ b/python/problems/functions/prime_numbers/common.py
@@ -25,12 +25,33 @@ hint_type = {
 }
 
 def test(python, code):
-    test_in = [1]
+    func_name = 'prime'
+    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 = [
+        (3, [2]),
+        (10, [2, 3, 5, 7]),
+        (100, [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97]),
+    ]
+
+    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)):
+        numbers = sorted([int(n) for n in get_numbers(ans[1])])
+
+        if numbers == to:
+            n_correct += 1
+        else:
+            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)}})
-- 
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/prime_numbers/common.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'python/problems/functions/prime_numbers/common.py')

diff --git a/python/problems/functions/prime_numbers/common.py b/python/problems/functions/prime_numbers/common.py
index 6806a08..33eb134 100644
--- a/python/problems/functions/prime_numbers/common.py
+++ b/python/problems/functions/prime_numbers/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
 from server.hints import Hint
 
 id = 234
-group = 'functions'
 number = 13
 visible = True
 
-- 
cgit v1.2.1