5 files changed, 85 insertions, 2 deletions
diff --git a/prolog/problems/world_data/common.py b/prolog/problems/world_data/common.py
index 350b139..c13c356 100644
--- a/prolog/problems/world_data/common.py
+++ b/prolog/problems/world_data/common.py
@@ -1,2 +1,2 @@
-id = 1000
+id = 1001
 number = 20
diff --git a/prolog/problems/world_data/holiday_2/common.py b/prolog/problems/world_data/holiday_2/common.py
new file mode 100644
index 0000000..0e7ba8f
--- /dev/null
+++ b/prolog/problems/world_data/holiday_2/common.py
@@ -0,0 +1,49 @@
+from operator import itemgetter
+import socket
+import prolog.engine
+from server.hints import Hint
+import server.problems
+
+id = 12529
+number = 10
+visible = True
+facts = 'mondial'
+
+solution = '''\
+holiday(Country, Neighbour):-
+  country(Country,CC1,_,_,_,_),
+  (borders(CC1,CC2,_) ; borders(CC2,CC1,_)),
+  once(geo_sea(_,CC2,_)),
+  country(Neighbour,CC2,_,_,_,_).
+'''
+
+test_cases = [
+    ("holiday('Slovenia', N)",
+        [{'N': "'Italy'"}, {'N': "'Croatia'"}]),
+    ("holiday(C, 'Canada')",
+        [{'C': "'United States'"}]),
+    ("holiday('Venezuela', 'Guyana')",
+        [{}]),
+    ("\+ holiday('Uzbekistan', _)",
+        [{}]),
+]
+
+def test(code, aux_code):
+    n_correct = 0
+    engine_id = None
+    try:
+        engine_id, output = prolog.engine.create(code=code+aux_code, timeout=5.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, inference_limit = None):
+                    n_correct += 1
+    except socket.timeout:
+        pass
+    finally:
+        if engine_id:
+            prolog.engine.destroy(engine_id)
+
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}]
+    return n_correct, len(test_cases), hints
+
diff --git a/prolog/problems/world_data/holiday_2/en.py b/prolog/problems/world_data/holiday_2/en.py
new file mode 100644
index 0000000..ecb248a
--- /dev/null
+++ b/prolog/problems/world_data/holiday_2/en.py
@@ -0,0 +1,17 @@
+name = 'holiday/2'
+slug = 'V katero sosednjo državo gremo lahko na morje?'
+
+description = '''\
+<p>V katero <em>sosednjo</em> državo gremo lahko na morje?</p>
+<p><code>holiday(Country, Neighbour)</code>: <code>Neighbour</code> je sosednja država od <code>Country</code>,
+ki ima morje.</p>
+<pre>
+?- holiday('Slovenia', Neighbour).
+  Neighbour = 'Italy' ;
+  Neighbour = 'Croatia'
+</pre>
+<p>Prav ti znajo priti podatki v obliki <code>borders(Country1, Country2, LenOfBorder)</code> in
+<code>geo_sea(Sea, CountryCode, Province)</code>.</p>
+'''
+
+hint = {}
diff --git a/prolog/problems/world_data/holiday_2/sl.py b/prolog/problems/world_data/holiday_2/sl.py
new file mode 100644
index 0000000..ecb248a
--- /dev/null
+++ b/prolog/problems/world_data/holiday_2/sl.py
@@ -0,0 +1,17 @@
+name = 'holiday/2'
+slug = 'V katero sosednjo državo gremo lahko na morje?'
+
+description = '''\
+<p>V katero <em>sosednjo</em> državo gremo lahko na morje?</p>
+<p><code>holiday(Country, Neighbour)</code>: <code>Neighbour</code> je sosednja država od <code>Country</code>,
+ki ima morje.</p>
+<pre>
+?- holiday('Slovenia', Neighbour).
+  Neighbour = 'Italy' ;
+  Neighbour = 'Croatia'
+</pre>
+<p>Prav ti znajo priti podatki v obliki <code>borders(Country1, Country2, LenOfBorder)</code> in
+<code>geo_sea(Sea, CountryCode, Province)</code>.</p>
+'''
+
+hint = {}
diff --git a/prolog/problems/world_data/similar_population_3/common.py b/prolog/problems/world_data/similar_population_3/common.py
index 11d541b..2226a30 100644
--- a/prolog/problems/world_data/similar_population_3/common.py
+++ b/prolog/problems/world_data/similar_population_3/common.py
@@ -5,7 +5,7 @@ from server.hints import Hint
 import server.problems
 
 id = 12519
-number = 1
+number = 40
 visible = True
 facts = 'mondial'