From 384d3c501a38b489312496b0bf9522bdf29053d8 Mon Sep 17 00:00:00 2001
From: Aleksander Sadikov <aleksander.sadikov@fri.uni-lj.si>
Date: Mon, 14 Dec 2015 13:57:29 +0100
Subject: Add Slovenian translations for Prolog exercises

---
 prolog/problems/sets/union_3/sl.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 prolog/problems/sets/union_3/sl.py

(limited to 'prolog/problems/sets/union_3')

diff --git a/prolog/problems/sets/union_3/sl.py b/prolog/problems/sets/union_3/sl.py
new file mode 100644
index 0000000..27d3088
--- /dev/null
+++ b/prolog/problems/sets/union_3/sl.py
@@ -0,0 +1,13 @@
+# coding=utf-8
+
+name = 'union/3'
+slug = 'Poišči unijo dveh množic'
+
+description = '''\
+<p><code>union(S1, S2, U)</code>: seznam <code>U</code> predstavlja unijo elementov v seznamih <code>S1</code> in <code>S2</code>, duplikatov (kot se za množice spodobi) ni.</p>
+<pre>
+  ?- union([1,5,2,3], [3,4,8,2], U).
+    U = [1,5,3,4,8,2].
+</pre>'''
+
+hint = {}
-- 
cgit v1.2.1


From 79f4196a6b86c6090ab0fb915d05bebc3a627783 Mon Sep 17 00:00:00 2001
From: Aleksander Sadikov <aleksander.sadikov@fri.uni-lj.si>
Date: Mon, 14 Dec 2015 15:24:48 +0100
Subject: Add tests for Prolog.{sorting,sets,license_plates}

---
 prolog/problems/sets/union_3/common.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'prolog/problems/sets/union_3')

diff --git a/prolog/problems/sets/union_3/common.py b/prolog/problems/sets/union_3/common.py
index 506913a..774c8cf 100644
--- a/prolog/problems/sets/union_3/common.py
+++ b/prolog/problems/sets/union_3/common.py
@@ -45,9 +45,7 @@ def test(program, solved_problems):
         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:
-                # Limit inferences for each solution to curb unbounded recursion.
-                limited = 'call_with_inference_limit(({}), 100000, _)'.format(query)
-                if prolog.engine.check_answers(engine_id, query=limited, answers=answers, timeout=1.0):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
-- 
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/sets/union_3/common.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'prolog/problems/sets/union_3')

diff --git a/prolog/problems/sets/union_3/common.py b/prolog/problems/sets/union_3/common.py
index 774c8cf..ae24943 100644
--- a/prolog/problems/sets/union_3/common.py
+++ b/prolog/problems/sets/union_3/common.py
@@ -34,14 +34,11 @@ test_cases = [
         [{'X': '[0, 1, 2, 3, 5, 6, 9]'}]),
 ]
 
-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