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/sorting/is_sorted_1/sl.py         | 15 +++++++++++++++
 prolog/problems/sorting/isort_2/sl.py             | 13 +++++++++++++
 prolog/problems/sorting/pivoting_4/sl.py          | 13 +++++++++++++
 prolog/problems/sorting/quick_sort_2/sl.py        | 13 +++++++++++++
 prolog/problems/sorting/sins_3/sl.py              | 15 +++++++++++++++
 prolog/problems/sorting/slowest_sort_ever_2/sl.py | 13 +++++++++++++
 6 files changed, 82 insertions(+)
 create mode 100644 prolog/problems/sorting/is_sorted_1/sl.py
 create mode 100644 prolog/problems/sorting/isort_2/sl.py
 create mode 100644 prolog/problems/sorting/pivoting_4/sl.py
 create mode 100644 prolog/problems/sorting/quick_sort_2/sl.py
 create mode 100644 prolog/problems/sorting/sins_3/sl.py
 create mode 100644 prolog/problems/sorting/slowest_sort_ever_2/sl.py

(limited to 'prolog/problems/sorting')

diff --git a/prolog/problems/sorting/is_sorted_1/sl.py b/prolog/problems/sorting/is_sorted_1/sl.py
new file mode 100644
index 0000000..5d4c1c5
--- /dev/null
+++ b/prolog/problems/sorting/is_sorted_1/sl.py
@@ -0,0 +1,15 @@
+# coding=utf-8
+
+name = 'is_sorted/1'
+slug = 'Preveri, če so elementi seznama naraščajoče urejeni'
+
+description = '''\
+<p><code>is_sorted(L)</code>: elementi v seznamu <code>L</code> morajo biti urejeni v naraščajočem vrstnem redu.</p>
+<pre>
+  ?- is_sorted([2,3,6,8,12]).
+    true.
+  ?- is_sorted([2,3,1,6,5]).
+    false.
+</pre>'''
+
+hint = {}
diff --git a/prolog/problems/sorting/isort_2/sl.py b/prolog/problems/sorting/isort_2/sl.py
new file mode 100644
index 0000000..79c3239
--- /dev/null
+++ b/prolog/problems/sorting/isort_2/sl.py
@@ -0,0 +1,13 @@
+# coding=utf-8
+
+name = 'isort/2'
+slug = 'Uredi seznam z uporabo urejanja z vstavljanjem'
+
+description = '''\
+<p><code>isort(L, SL)</code>: seznam <code>SL</code> vsebuje elemente iz seznama <code>L</code> urejene v naraščajočem vrstnem redu. Uporabi predikat <code>sins/3</code> za implementacijo urejanja z vstavljanjem.</p>
+<pre>
+  ?- isort([2,3,1,5,4], L).
+    L = [1,2,3,4,5].
+</pre>'''
+
+hint = {}
diff --git a/prolog/problems/sorting/pivoting_4/sl.py b/prolog/problems/sorting/pivoting_4/sl.py
new file mode 100644
index 0000000..b18e112
--- /dev/null
+++ b/prolog/problems/sorting/pivoting_4/sl.py
@@ -0,0 +1,13 @@
+# coding=utf-8
+
+name = 'pivoting/4'
+slug = 'Razdeli seznam na dva dela glede na podani element (pivot)'
+
+description = '''\
+<p><code>pivoting(P, L, S, G)</code>: seznam <code>S</code> vsebuje elemente iz <code>L</code> <em>manjše ali enake</em> <code>P</code>, seznam <code>G</code> pa elemente iz <code>L</code> <em>večje od</em> <code>P</code>. Vrstni red elementov v <code>S</code> in <code>G</code> naj bo enak kot v <code>L</code>.</p>
+<pre>
+  ?- pivoting(4, [1,4,5,8,6,4,2], S, G).
+    S = [1,4,4,2], G = [5,8,6].
+</pre>'''
+
+hint = {}
diff --git a/prolog/problems/sorting/quick_sort_2/sl.py b/prolog/problems/sorting/quick_sort_2/sl.py
new file mode 100644
index 0000000..9611b46
--- /dev/null
+++ b/prolog/problems/sorting/quick_sort_2/sl.py
@@ -0,0 +1,13 @@
+# coding=utf-8
+
+name = 'quick_sort/2'
+slug = 'Uredi seznam z algoritmom quicksort'
+
+description = '''\
+<p><code>quick_sort(L, SL)</code>: seznam <code>SL</code> vsebuje elemente iz <code>L</code> urejene v naraščajočem vrstnem redu. Uporabi predikat <code>pivoting/4</code> za implementacijo algoritma quicksort.</p>
+<pre>
+  ?- quick_sort([2,3,1,5,4], L).
+    L = [1,2,3,4,5].
+</pre>'''
+
+hint = {}
diff --git a/prolog/problems/sorting/sins_3/sl.py b/prolog/problems/sorting/sins_3/sl.py
new file mode 100644
index 0000000..22e51b2
--- /dev/null
+++ b/prolog/problems/sorting/sins_3/sl.py
@@ -0,0 +1,15 @@
+# coding=utf-8
+
+name = 'sins/3'
+slug = 'Vstavi element na ustrezno mesto v urejen seznam'
+
+description = '''\
+<p><code>sins(X, SortedList, NewList)</code>: seznam <code>NewList</code> dobiš tako, da vstaviš element <code>X</code> v <code>SortedList</code> na ustrezno mesto tako, da ohraniš urejenost elementov.</p>
+<pre>
+  ?- sins(4, [1,2,3,5], L).
+    L = [1,2,3,4,5].
+  ?- sins(3, [1,2,3,4], L).
+    L = [1,2,3,3,4].
+</pre>'''
+
+hint = {}
diff --git a/prolog/problems/sorting/slowest_sort_ever_2/sl.py b/prolog/problems/sorting/slowest_sort_ever_2/sl.py
new file mode 100644
index 0000000..c62582c
--- /dev/null
+++ b/prolog/problems/sorting/slowest_sort_ever_2/sl.py
@@ -0,0 +1,13 @@
+# coding=utf-8
+
+name = 'slowest_sort_ever/2'
+slug = 'Uredi seznam elementov s pomočjo naključnih permutacij'
+
+description = '''\
+<p><code>slowest_sort_ever(L, SL)</code>: seznam <code>SL</code> vsebuje elemente seznama <code>L</code> v naraščajočem vrstnem redu. Časovna zahtevnost algoritma naj bo O(n * n!).</p>
+<pre>
+  ?- slowest_sort_ever([2,3,1,5,4], L).
+    L = [1,2,3,4,5].
+</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/sorting/is_sorted_1/common.py      | 46 ++++++++++++++++++++++
 prolog/problems/sorting/isort_2/common.py          | 40 +++++++++++++++++++
 prolog/problems/sorting/pivoting_4/common.py       | 40 +++++++++++++++++++
 prolog/problems/sorting/quick_sort_2/common.py     | 40 +++++++++++++++++++
 prolog/problems/sorting/sins_3/common.py           | 42 ++++++++++++++++++++
 .../problems/sorting/slowest_sort_ever_2/common.py | 40 +++++++++++++++++++
 6 files changed, 248 insertions(+)

(limited to 'prolog/problems/sorting')

diff --git a/prolog/problems/sorting/is_sorted_1/common.py b/prolog/problems/sorting/is_sorted_1/common.py
index 8feb549..9213ddc 100644
--- a/prolog/problems/sorting/is_sorted_1/common.py
+++ b/prolog/problems/sorting/is_sorted_1/common.py
@@ -1,5 +1,9 @@
 # coding=utf-8
 
+from operator import itemgetter
+import prolog.engine
+import server.problems
+
 id = 121
 number = 28
 visible = True
@@ -12,3 +16,45 @@ is_sorted([H1,H2|T]) :-
   H1 =< H2,
   is_sorted([H2|T]).
 '''
+
+test_cases = [
+    ('is_sorted([])',
+        [{}]),
+    ('is_sorted([5, 6, 13, 555, 2111, 2112])',
+        [{}]),
+    ('is_sorted([2, 5, 5, 13, 555, 2111, 2112])',
+        [{}]),
+    ('is_sorted([-2])',
+        [{}]),
+    ('is_sorted([-42, -42, -42, -42])',
+        [{}]),
+    ('\+ is_sorted([3, 4, 5, 6, 1, 2, 3])',
+        [{}]),
+    ('\+ is_sorted([3, 4, 5, 6, 1, 2, 3, 0])',
+        [{}]),
+]
+
+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 []
diff --git a/prolog/problems/sorting/isort_2/common.py b/prolog/problems/sorting/isort_2/common.py
index f2c4244..6041b35 100644
--- a/prolog/problems/sorting/isort_2/common.py
+++ b/prolog/problems/sorting/isort_2/common.py
@@ -1,5 +1,9 @@
 # coding=utf-8
 
+from operator import itemgetter
+import prolog.engine
+import server.problems
+
 id = 123
 number = 30
 visible = True
@@ -17,3 +21,39 @@ isort([H|T], SL) :-
   isort(T, ST),
   sins123(H, ST, SL).
 '''
+
+test_cases = [
+    ('isort([], X)',
+        [{'X': '[]'}]),
+    ('isort([5, 3, 5, 5, 1, 2, 0], X)',
+        [{'X': '[0, 1, 2, 3, 5, 5, 5]'}]),
+    ('isort([2, 1, 3, 5, 6, 0, 22, 3], X)',
+        [{'X': '[0, 1, 2, 3, 3, 5, 6, 22]'}]),
+    ('isort([5, 4, 3, 2, 1], X)',
+        [{'X': '[1, 2, 3, 4, 5]'}]),
+]
+
+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 []
diff --git a/prolog/problems/sorting/pivoting_4/common.py b/prolog/problems/sorting/pivoting_4/common.py
index dd1a1a9..0e9afaa 100644
--- a/prolog/problems/sorting/pivoting_4/common.py
+++ b/prolog/problems/sorting/pivoting_4/common.py
@@ -1,5 +1,9 @@
 # coding=utf-8
 
+from operator import itemgetter
+import prolog.engine
+import server.problems
+
 id = 124
 number = 31
 visible = True
@@ -14,3 +18,39 @@ pivoting(P, [H|T], S, [H|G]) :-
   H > P,
   pivoting(P, T, S, G).
 '''
+
+test_cases = [
+    ('pivoting(5, [], A, B)',
+        [{'A': '[]', 'B': '[]'}]),
+    ('pivoting(5, [6, 7, 6], A, B)',
+        [{'A': '[]', 'B': '[6, 7, 6]'}]),
+    ('pivoting(4, [2, 1, 8, 9, 3, 4, 2], A, B)',
+        [{'A': '[2, 1, 3, 4, 2]', 'B': '[8, 9]'}]),
+    ('pivoting(4, [22, 1, 0, 8, 3, 5, 7, -2], A, B)',
+        [{'A': '[1, 0, 3, -2]', 'B': '[22, 8, 5, 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 []
diff --git a/prolog/problems/sorting/quick_sort_2/common.py b/prolog/problems/sorting/quick_sort_2/common.py
index 4afc8fa..b1449f1 100644
--- a/prolog/problems/sorting/quick_sort_2/common.py
+++ b/prolog/problems/sorting/quick_sort_2/common.py
@@ -1,5 +1,9 @@
 # coding=utf-8
 
+from operator import itemgetter
+import prolog.engine
+import server.problems
+
 id = 125
 number = 32
 visible = True
@@ -23,3 +27,39 @@ quick_sort([Pivot|T], Sorted) :-
   quick_sort(Greater, SortedGreater),
   conc125(SortedSmaller, [Pivot|SortedGreater], Sorted).
 '''
+
+test_cases = [
+    ('quick_sort([], X)',
+        [{'X': '[]'}]),
+    ('quick_sort([5, 3, 5, 5, 1, 2, 0], X)',
+        [{'X': '[0, 1, 2, 3, 5, 5, 5]'}]),
+    ('quick_sort([2, 1, 3, 5, 6, 0, 22, 3], X)',
+        [{'X': '[0, 1, 2, 3, 3, 5, 6, 22]'}]),
+    ('quick_sort([5, 4, 3, 2, 1], X)',
+        [{'X': '[1, 2, 3, 4, 5]'}]),
+]
+
+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 []
diff --git a/prolog/problems/sorting/sins_3/common.py b/prolog/problems/sorting/sins_3/common.py
index ab592ea..4c707ca 100644
--- a/prolog/problems/sorting/sins_3/common.py
+++ b/prolog/problems/sorting/sins_3/common.py
@@ -1,5 +1,9 @@
 # coding=utf-8
 
+from operator import itemgetter
+import prolog.engine
+import server.problems
+
 id = 122
 number = 29
 visible = True
@@ -13,3 +17,41 @@ sins(X, [Y|T], [Y|L]) :-
   X > Y,
   sins(X, T, L).
 '''
+
+test_cases = [
+    ('sins(4, [], X)',
+        [{'X': '[4]'}]),
+    ('sins(4, [1, 2, 5, 6, 8], X)',
+        [{'X': '[1, 2, 4, 5, 6, 8]'}]),
+    ('sins(8, [1, 2, 3, 4, 5, 6, 7], X)',
+        [{'X': '[1, 2, 3, 4, 5, 6, 7, 8]'}]),
+    ('sins(1, [2, 3, 4, 5, 6, 7], X)',
+        [{'X': '[1, 2, 3, 4, 5, 6, 7]'}]),
+    ('sins(2, [2, 3, 4, 5, 6, 7], X)',
+        [{'X': '[2, 2, 3, 4, 5, 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 []
diff --git a/prolog/problems/sorting/slowest_sort_ever_2/common.py b/prolog/problems/sorting/slowest_sort_ever_2/common.py
index fc8f980..72e25e2 100644
--- a/prolog/problems/sorting/slowest_sort_ever_2/common.py
+++ b/prolog/problems/sorting/slowest_sort_ever_2/common.py
@@ -1,5 +1,9 @@
 # coding=utf-8
 
+from operator import itemgetter
+import prolog.engine
+import server.problems
+
 id = 126
 number = 33
 visible = True
@@ -24,3 +28,39 @@ slowest_sort_ever(L, S) :-
   permute126(L, S),
   is_sorted126(S).
 '''
+
+test_cases = [
+    ('slowest_sort_ever([], X)',
+        [{'X': '[]'}]),
+    ('slowest_sort_ever([5, 3, 5, 1], X)',
+        [{'X': '[1, 3, 5, 5]'}]),
+    ('slowest_sort_ever([2, 1, 5, 6], X)',
+        [{'X': '[1, 2, 5, 6]'}]),
+    ('slowest_sort_ever([5, 4, 3, 2], X)',
+        [{'X': '[2, 3, 4, 5]'}]),
+]
+
+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 766e2ba30413850ab43842de0aa3e9a80c5e7236 Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Wed, 23 Dec 2015 16:19:06 +0100
Subject: Add info about reusable solutions to Prolog groups

---
 prolog/problems/sorting/common.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'prolog/problems/sorting')

diff --git a/prolog/problems/sorting/common.py b/prolog/problems/sorting/common.py
index f006f10..1ad1c8c 100644
--- a/prolog/problems/sorting/common.py
+++ b/prolog/problems/sorting/common.py
@@ -1,2 +1,4 @@
 id = 3
 number = 3
+
+allowed_groups = ['sorting', 'lists']
-- 
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/sorting/is_sorted_1/common.py         | 7 ++-----
 prolog/problems/sorting/isort_2/common.py             | 7 ++-----
 prolog/problems/sorting/pivoting_4/common.py          | 7 ++-----
 prolog/problems/sorting/quick_sort_2/common.py        | 7 ++-----
 prolog/problems/sorting/sins_3/common.py              | 7 ++-----
 prolog/problems/sorting/slowest_sort_ever_2/common.py | 7 ++-----
 6 files changed, 12 insertions(+), 30 deletions(-)

(limited to 'prolog/problems/sorting')

diff --git a/prolog/problems/sorting/is_sorted_1/common.py b/prolog/problems/sorting/is_sorted_1/common.py
index 9213ddc..db5c3cc 100644
--- a/prolog/problems/sorting/is_sorted_1/common.py
+++ b/prolog/problems/sorting/is_sorted_1/common.py
@@ -34,14 +34,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:
diff --git a/prolog/problems/sorting/isort_2/common.py b/prolog/problems/sorting/isort_2/common.py
index 6041b35..1669a4a 100644
--- a/prolog/problems/sorting/isort_2/common.py
+++ b/prolog/problems/sorting/isort_2/common.py
@@ -33,14 +33,11 @@ test_cases = [
         [{'X': '[1, 2, 3, 4, 5]'}]),
 ]
 
-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:
diff --git a/prolog/problems/sorting/pivoting_4/common.py b/prolog/problems/sorting/pivoting_4/common.py
index 0e9afaa..3a3a906 100644
--- a/prolog/problems/sorting/pivoting_4/common.py
+++ b/prolog/problems/sorting/pivoting_4/common.py
@@ -30,14 +30,11 @@ test_cases = [
         [{'A': '[1, 0, 3, -2]', 'B': '[22, 8, 5, 7]'}]),
 ]
 
-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:
diff --git a/prolog/problems/sorting/quick_sort_2/common.py b/prolog/problems/sorting/quick_sort_2/common.py
index b1449f1..d46c185 100644
--- a/prolog/problems/sorting/quick_sort_2/common.py
+++ b/prolog/problems/sorting/quick_sort_2/common.py
@@ -39,14 +39,11 @@ test_cases = [
         [{'X': '[1, 2, 3, 4, 5]'}]),
 ]
 
-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:
diff --git a/prolog/problems/sorting/sins_3/common.py b/prolog/problems/sorting/sins_3/common.py
index 4c707ca..efc544e 100644
--- a/prolog/problems/sorting/sins_3/common.py
+++ b/prolog/problems/sorting/sins_3/common.py
@@ -31,14 +31,11 @@ test_cases = [
         [{'X': '[2, 2, 3, 4, 5, 6, 7]'}]),
 ]
 
-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:
diff --git a/prolog/problems/sorting/slowest_sort_ever_2/common.py b/prolog/problems/sorting/slowest_sort_ever_2/common.py
index 72e25e2..5d0f566 100644
--- a/prolog/problems/sorting/slowest_sort_ever_2/common.py
+++ b/prolog/problems/sorting/slowest_sort_ever_2/common.py
@@ -40,14 +40,11 @@ test_cases = [
         [{'X': '[2, 3, 4, 5]'}]),
 ]
 
-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