Merge branch 'master' of 192.168.15.97:codeq-problems

Conflicts:
	python/problems/functions/palindrome/sl.py
	python/problems/functions/palindromic_numbers/sl.py

2 files changed, 55 insertions, 0 deletions

diff --git a/prolog/problems/clp_fd/gcd_3/common.py b/prolog/problems/clp_fd/gcd_3/common.py
index 7cd6623..f24e0bb 100644
--- a/prolog/problems/clp_fd/gcd_3/common.py
+++ b/prolog/problems/clp_fd/gcd_3/common.py
@@ -1,5 +1,9 @@
 # coding=utf-8
 
+from operator import itemgetter
+import prolog.engine
+import server.problems
+
 id = 149
 number = 61
 visible = True
@@ -15,3 +19,40 @@ gcd(X, Y, GCD):-
   cd(X, Y, GCD),
   \+ ( cd(X, Y, CD), CD > GCD ).
 '''
+
+test_cases = [
+    ('gcd(1, 1, X)',
+        [{'X': '1'}]),
+    ('gcd(12, 8, X)',
+        [{'X': '4'}]),
+    ('gcd(18, 36, X)',
+        [{'X': '18'}]),
+    ('gcd(21, 14, X)',
+        [{'X': '7'}]),
+    ('gcd(10, 22, X)',
+        [{'X': '2'}]),
+    ('gcd(66, 60, X)',
+        [{'X': '6'}]),
+]
+
+def test(code, aux_code):
+    n_correct = 0
+    engine_id = None
+    try:
+        engine_id, output = prolog.engine.create(code=code+aux_code, timeout=1.0)
+        if engine_id is not None and 'error' not in map(itemgetter(0), output):
+            # Engine successfully created, and no syntax error in program.
+            for query, answers in test_cases:
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
+                    n_correct += 1
+    finally:
+        if engine_id:
+            prolog.engine.destroy(engine_id)
+
+    passed = n_correct == len(test_cases)
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}]
+    return passed, hints
+
+def hint(program, solved_problems):
+    # TODO
+    return []
diff --git a/prolog/problems/clp_fd/gcd_3/sl.py b/prolog/problems/clp_fd/gcd_3/sl.py
new file mode 100644
index 0000000..9ef1a87
--- /dev/null
+++ b/prolog/problems/clp_fd/gcd_3/sl.py
@@ -0,0 +1,14 @@
+# coding=utf-8
+
+name = 'gcd/3'
+slug = 'Največji skupni delitelj'
+
+description = '''\
+<p><code>gcd(X, Y, GCD)</code>: <code>GCD</code> je največji skupni delitelj števil <code>X</code> in <code>Y</code>. Implementiraj ta predikat z uporabo omejitev.</p>
+<p>Namig: poskusi najprej napisati predikat, ki poišče <em>vse</em> skupne delitelje dveh števil.</p>
+<pre>
+  ?- gcd(36, 84, GCD).
+    GCD = 12.
+</pre>'''
+
+hint = {}