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, 45 insertions, 0 deletions

diff --git a/prolog/problems/clp_fd/puzzle_momson_2/common.py b/prolog/problems/clp_fd/puzzle_momson_2/common.py
index 9cef246..906bd15 100644
--- a/prolog/problems/clp_fd/puzzle_momson_2/common.py
+++ b/prolog/problems/clp_fd/puzzle_momson_2/common.py
@@ -1,5 +1,9 @@
 # coding=utf-8
 
+from operator import itemgetter
+import prolog.engine
+import server.problems
+
 id = 152
 number = 58
 visible = True
@@ -13,3 +17,34 @@ puzzle_momson(M, S) :-
   M + S #= 66,
   M #> S,
   labeling([], [M, S]).'''
+
+test_cases = [
+    ('puzzle_momson(M, S)',
+        [{'M': '42', 'S': '24'}]),
+    ('puzzle_momson(M, S)',
+        [{'M': '51', 'S': '15'}]),
+    ('setof(M/S, puzzle_momson(M, S), X)',
+        [{'X': '[42/24, 51/15]'}]),
+]
+
+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/puzzle_momson_2/sl.py b/prolog/problems/clp_fd/puzzle_momson_2/sl.py
new file mode 100644
index 0000000..593f153
--- /dev/null
+++ b/prolog/problems/clp_fd/puzzle_momson_2/sl.py
@@ -0,0 +1,10 @@
+# coding=utf-8
+
+name = 'puzzle_momson/2'
+slug = 'Uganka z leti: mama in sin'
+
+description = '''\
+<p>Mama in sin sta skupaj stara 66 let. Mamina leta so ravno sinova obrnjena leta (obrnjene so cifre). Koliko sta stara?</p>
+<p>Napiši predikat <code>puzzle_momson(M, S)</code>, ki izračuna starost mame <code>M</code> in sina <code>S</code>.</p>'''
+
+hint = {}