From f22468b134a88fcd7acb1415c9997f578f1abe7b Mon Sep 17 00:00:00 2001
From: Aleksander Sadikov <aleksander.sadikov@fri.uni-lj.si>
Date: Tue, 15 Dec 2015 10:44:52 +0100
Subject: Add tests for Prolog.clp_fd

---
 prolog/problems/clp_fd/magic_1/common.py | 41 ++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'prolog/problems/clp_fd/magic_1')

diff --git a/prolog/problems/clp_fd/magic_1/common.py b/prolog/problems/clp_fd/magic_1/common.py
index 17a9199..b897cb3 100644
--- a/prolog/problems/clp_fd/magic_1/common.py
+++ b/prolog/problems/clp_fd/magic_1/common.py
@@ -1,5 +1,9 @@
 # coding=utf-8
 
+from operator import itemgetter
+import prolog.engine
+import server.problems
+
 id = 151
 number = 60
 visible = True
@@ -16,3 +20,40 @@ magic(L):-
   A1+B1+C1 #= A3+B3+C3,
   A1+B2+C3 #= A3+B2+C1,
   labeling([], L).'''
+
+test_cases = [
+    ('magic(X)',
+        [{'X': '[2, 7, 6, 9, 5, 1, 4, 3, 8]'}]),
+    ('magic(X)',
+        [{'X': '[2, 9, 4, 7, 5, 3, 6, 1, 8]'}]),
+    ('setof(S, magic(S), X)',
+        [{'X': '[[2, 7, 6, 9, 5, 1, 4, 3, 8], [2, 9, 4, 7, 5, 3, 6, 1, 8], \
+                 [4, 3, 8, 9, 5, 1, 2, 7, 6], [4, 9, 2, 3, 5, 7, 8, 1, 6], \
+                 [6, 1, 8, 7, 5, 3, 2, 9, 4], [6, 7, 2, 1, 5, 9, 8, 3, 4], \
+                 [8, 1, 6, 3, 5, 7, 4, 9, 2], [8, 3, 4, 1, 5, 9, 6, 7, 2]]'}]),
+]
+
+def test(program, solved_problems):
+    code = (program + '\n' +
+            server.problems.solutions_for_problems('prolog', solved_problems))
+
+    n_correct = 0
+    engine_id = None
+    try:
+        engine_id, output = prolog.engine.create(code=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 []
-- 
cgit v1.2.1


From 2a4a1d39bfcfb8b258be96c180dde09a12345295 Mon Sep 17 00:00:00 2001
From: Aleksander Sadikov <aleksander.sadikov@fri.uni-lj.si>
Date: Tue, 15 Dec 2015 10:45:30 +0100
Subject: Add Slovenian translations for Prolog.{clp_fd,dcg}

---
 prolog/problems/clp_fd/magic_1/sl.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 prolog/problems/clp_fd/magic_1/sl.py

(limited to 'prolog/problems/clp_fd/magic_1')

diff --git a/prolog/problems/clp_fd/magic_1/sl.py b/prolog/problems/clp_fd/magic_1/sl.py
new file mode 100644
index 0000000..8cf040e
--- /dev/null
+++ b/prolog/problems/clp_fd/magic_1/sl.py
@@ -0,0 +1,14 @@
+# coding=utf-8
+
+name = 'magic/1'
+slug = '3x3 magični kvadrat'
+
+description = '''\
+<p><code>magic(S)</code>: seznam <code>S</code> predstavlja 3×3 magični kvadrat (<code>S</code> je permutacija števil 1 do 9 -- tri števila tvorijo eno vrstico). Vsote števil v vsaki vrstici, stolpcu in glavni diagonali magičnega kvadrata so enake. Implementiraj ta predikat z uporabo omejitev. Predikat naj vrne vse rešitve, eno po eno.</p>
+<pre>
+  ?- magic(S).
+    S = [2, 7, 6, 9, 5, 1, 4, 3, 8] ;
+    …
+</pre>'''
+
+hint = {}
-- 
cgit v1.2.1


From c1bb0d56b2c0482c766d094c65fdf0fd9d1aa0ba Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Wed, 23 Dec 2015 16:23:43 +0100
Subject: Simplify Prolog test function

---
 prolog/problems/clp_fd/magic_1/common.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'prolog/problems/clp_fd/magic_1')

diff --git a/prolog/problems/clp_fd/magic_1/common.py b/prolog/problems/clp_fd/magic_1/common.py
index b897cb3..3ffe72f 100644
--- a/prolog/problems/clp_fd/magic_1/common.py
+++ b/prolog/problems/clp_fd/magic_1/common.py
@@ -33,14 +33,11 @@ test_cases = [
                  [8, 1, 6, 3, 5, 7, 4, 9, 2], [8, 3, 4, 1, 5, 9, 6, 7, 2]]'}]),
 ]
 
-def test(program, solved_problems):
-    code = (program + '\n' +
-            server.problems.solutions_for_problems('prolog', solved_problems))
-
+def test(code, aux_code):
     n_correct = 0
     engine_id = None
     try:
-        engine_id, output = prolog.engine.create(code=code, timeout=1.0)
+        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:
-- 
cgit v1.2.1