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/is_subset_2/sl.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 prolog/problems/sets/is_subset_2/sl.py

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

diff --git a/prolog/problems/sets/is_subset_2/sl.py b/prolog/problems/sets/is_subset_2/sl.py
new file mode 100644
index 0000000..ccec5b0
--- /dev/null
+++ b/prolog/problems/sets/is_subset_2/sl.py
@@ -0,0 +1,15 @@
+# coding=utf-8
+
+name = 'is_subset/2'
+slug = 'Preveri, če je prva množica podmnožica od druge'
+
+description = '''\
+<p><code>is_subset(S1, S2)</code>: množica <code>S1</code> je podmnožica od <code>S2</code>.</p>
+<pre>
+  ?- is_subset([2,1,3,5,0], [3,2,1,4,5,9]).
+    false.
+  ?- is_subset([2,1,3,5], [3,2,1,4,5,9]).
+    true.
+</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/is_subset_2/common.py | 40 ++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

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

diff --git a/prolog/problems/sets/is_subset_2/common.py b/prolog/problems/sets/is_subset_2/common.py
index 4047146..a64d0f8 100644
--- a/prolog/problems/sets/is_subset_2/common.py
+++ b/prolog/problems/sets/is_subset_2/common.py
@@ -1,5 +1,9 @@
 # coding=utf-8
 
+from operator import itemgetter
+import prolog.engine
+import server.problems
+
 id = 132
 number = 39
 visible = True
@@ -15,3 +19,39 @@ is_subset([H|T], S2) :-
   memb132(H, S2),
   is_subset(T, S2).
 '''
+
+test_cases = [
+    ('is_subset(X, [])',
+        [{'X': '[]'}]),
+    ('is_subset([2, 1, 3], [3, 2, 1, 4, 6, 7])',
+        [{}]),
+    ('\+ is_subset([2, 1, 0, 3], [3, 2, 1, 4, 6, 7])',
+        [{}]),
+    ('is_subset([3, 2, 1, 4, 6, 7], [3, 2, 1, 4, 6, 7])',
+        [{}]),
+]
+
+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 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/is_subset_2/common.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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

diff --git a/prolog/problems/sets/is_subset_2/common.py b/prolog/problems/sets/is_subset_2/common.py
index a64d0f8..0d78cd6 100644
--- a/prolog/problems/sets/is_subset_2/common.py
+++ b/prolog/problems/sets/is_subset_2/common.py
@@ -31,14 +31,11 @@ test_cases = [
         [{}]),
 ]
 
-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