From 6a5d6fc44906734b35f5fcb70a447c5300bf26e5 Mon Sep 17 00:00:00 2001
From: Aleksander Sadikov <aleksander.sadikov@fri.uni-lj.si>
Date: Tue, 18 Oct 2016 02:11:35 +0200
Subject: Week2: grant/1 and landlocked2/1 exercises added.

---
 prolog/problems/world_data/landlocked2_1/common.py | 48 ++++++++++++++++++++++
 prolog/problems/world_data/landlocked2_1/en.py     | 12 ++++++
 prolog/problems/world_data/landlocked2_1/sl.py     | 12 ++++++
 3 files changed, 72 insertions(+)
 create mode 100644 prolog/problems/world_data/landlocked2_1/common.py
 create mode 100644 prolog/problems/world_data/landlocked2_1/en.py
 create mode 100644 prolog/problems/world_data/landlocked2_1/sl.py

(limited to 'prolog/problems/world_data/landlocked2_1')

diff --git a/prolog/problems/world_data/landlocked2_1/common.py b/prolog/problems/world_data/landlocked2_1/common.py
new file mode 100644
index 0000000..5c17886
--- /dev/null
+++ b/prolog/problems/world_data/landlocked2_1/common.py
@@ -0,0 +1,48 @@
+from operator import itemgetter
+import socket
+import prolog.engine
+from server.hints import Hint
+import server.problems
+
+id = 12539
+number = 39
+visible = True
+facts = 'mondial'
+
+solution = '''\
+landlocked2(Country):-
+  findall(CC, (country(_,CC,_,_,_,_), \+ geo_sea(_,CC,_)), LL),
+  member(C, LL),
+  \+ ( (borders(C,C1,_) ; borders(C1,C,_)),
+       \+ member(C1, LL) ),
+  country(Country,C,_,_,_,_).
+'''
+
+test_cases = [
+    ("landlocked2(Country)",
+        [{'Country': "'Liechtenstein'"}, {'Country': "'Uzbekistan'"}]),
+    ("\+ landlocked2('Slovenia')",
+        [{}]),
+    ("landlocked2('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/landlocked2_1/en.py b/prolog/problems/world_data/landlocked2_1/en.py
new file mode 100644
index 0000000..6d69382
--- /dev/null
+++ b/prolog/problems/world_data/landlocked2_1/en.py
@@ -0,0 +1,12 @@
+name = 'landlocked2/1'
+slug = 'poišči države brez morja, ki ne mejijo na države z morjem'
+
+description = '''\
+<p>Nekatere države nimajo morja. Spet druge države imajo še manj sreče -- ne samo, da nimajo morja,
+tudi ne mejijo na nobeno državo, ki bi morje imela. Po angleško takim državam rečemo "double landlocked".</p>
+<p><code>landlocked2(Country)</code>: predikat eno po eno vrne vse države, ki nimajo ne morja, ne sosede
+z morjem.</p>
+<p>Prav ti znajo priti podatki v obliki <code>geo_sea(Sea, CountryCode, Province)</code>.</p>
+'''
+
+hint = {}
diff --git a/prolog/problems/world_data/landlocked2_1/sl.py b/prolog/problems/world_data/landlocked2_1/sl.py
new file mode 100644
index 0000000..6d69382
--- /dev/null
+++ b/prolog/problems/world_data/landlocked2_1/sl.py
@@ -0,0 +1,12 @@
+name = 'landlocked2/1'
+slug = 'poišči države brez morja, ki ne mejijo na države z morjem'
+
+description = '''\
+<p>Nekatere države nimajo morja. Spet druge države imajo še manj sreče -- ne samo, da nimajo morja,
+tudi ne mejijo na nobeno državo, ki bi morje imela. Po angleško takim državam rečemo "double landlocked".</p>
+<p><code>landlocked2(Country)</code>: predikat eno po eno vrne vse države, ki nimajo ne morja, ne sosede
+z morjem.</p>
+<p>Prav ti znajo priti podatki v obliki <code>geo_sea(Sea, CountryCode, Province)</code>.</p>
+'''
+
+hint = {}
-- 
cgit v1.2.1


From 08cc8882bf1a1d77c192726954883bfd5bff7a5a Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Tue, 18 Oct 2016 16:26:31 +0200
Subject: Prolog: fix world_data problem IDs and numbers

---
 prolog/problems/world_data/landlocked2_1/common.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'prolog/problems/world_data/landlocked2_1')

diff --git a/prolog/problems/world_data/landlocked2_1/common.py b/prolog/problems/world_data/landlocked2_1/common.py
index 5c17886..3c5b3e2 100644
--- a/prolog/problems/world_data/landlocked2_1/common.py
+++ b/prolog/problems/world_data/landlocked2_1/common.py
@@ -4,8 +4,8 @@ import prolog.engine
 from server.hints import Hint
 import server.problems
 
-id = 12539
-number = 39
+id = 10006
+number = 60
 visible = True
 facts = 'mondial'
 
-- 
cgit v1.2.1