From 11cd5e340324a322c2af96ff206456914fc3c3c0 Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Sun, 24 Apr 2016 22:21:55 +0200
Subject: Prolog: rename max_sum/2 to max_adj_pair/2

---
 prolog/problems/clp_r/max_adj_pair_2/common.py | 51 ++++++++++++++++++++++++++
 prolog/problems/clp_r/max_adj_pair_2/en.py     | 15 ++++++++
 prolog/problems/clp_r/max_adj_pair_2/sl.py     | 15 ++++++++
 prolog/problems/clp_r/max_sum_2/common.py      | 51 --------------------------
 prolog/problems/clp_r/max_sum_2/en.py          | 15 --------
 prolog/problems/clp_r/max_sum_2/sl.py          | 15 --------
 6 files changed, 81 insertions(+), 81 deletions(-)
 create mode 100644 prolog/problems/clp_r/max_adj_pair_2/common.py
 create mode 100644 prolog/problems/clp_r/max_adj_pair_2/en.py
 create mode 100644 prolog/problems/clp_r/max_adj_pair_2/sl.py
 delete mode 100644 prolog/problems/clp_r/max_sum_2/common.py
 delete mode 100644 prolog/problems/clp_r/max_sum_2/en.py
 delete mode 100644 prolog/problems/clp_r/max_sum_2/sl.py

(limited to 'prolog/problems')

diff --git a/prolog/problems/clp_r/max_adj_pair_2/common.py b/prolog/problems/clp_r/max_adj_pair_2/common.py
new file mode 100644
index 0000000..bb2cd18
--- /dev/null
+++ b/prolog/problems/clp_r/max_adj_pair_2/common.py
@@ -0,0 +1,51 @@
+# coding=utf-8
+
+from operator import itemgetter
+import socket
+
+import prolog.engine
+import prolog.util
+from server.hints import Hint, HintPopup
+
+id = 156
+number = 66
+visible = True
+facts = None
+
+solution = '''\
+max_adj_pair([_], S) :-
+    minimize(S).
+max_adj_pair([A,B|T], S) :-
+    { S >= A + B },
+    max_adj_pair([B|T], S).'''
+
+test_cases = [
+    ('max_adj_pair([4.2, 5.1], X), abs(X - 9.3) =< 1e-8',
+        [{}]),
+    ('max_adj_pair([4.5, -1.9, 1.3, -2.5, 3.5], X), abs(X - 2.6) =< 1e-8',
+        [{}]),
+    ('max_adj_pair([7.5, 8.8, 4.2, 6.5, 2.2], X), abs(X - 16.3) =< 1e-8',
+        [{}]),
+    ('max_adj_pair([-2.8, -2.2, 5.5, -2.2, 8.5, 0.7], X), abs(X - 9.2) =< 1e-8',
+        [{}]),
+]
+
+def test(code, aux_code):
+    n_correct = 0
+    engine_id = None
+    try:
+        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:
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
+                    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/clp_r/max_adj_pair_2/en.py b/prolog/problems/clp_r/max_adj_pair_2/en.py
new file mode 100644
index 0000000..d85bbcd
--- /dev/null
+++ b/prolog/problems/clp_r/max_adj_pair_2/en.py
@@ -0,0 +1,15 @@
+# coding=utf-8
+
+name = 'max_adj_pair/2'
+slug = 'find the maximal pair of adjacent elements'
+
+description = '''\
+<p><code>max_adj_pair(List, Max)</code>: <code>Max</code> is the maximal sum of two adjacent elements in <code>List</code>.</p>
+<pre>
+?- max_adj_pair([4.5, 3.6, 1.2, 6.7], Max).
+  Max = 8.1.
+?- max_adj_pair([1.1, 1.2, -12.3, 8.8], Max).
+  Max = 2.3.
+</pre>'''
+
+hint = {}
diff --git a/prolog/problems/clp_r/max_adj_pair_2/sl.py b/prolog/problems/clp_r/max_adj_pair_2/sl.py
new file mode 100644
index 0000000..eaed41e
--- /dev/null
+++ b/prolog/problems/clp_r/max_adj_pair_2/sl.py
@@ -0,0 +1,15 @@
+# coding=utf-8
+
+name = 'max_adj_pair/2'
+slug = 'najdi največja sosedna elementa seznama'
+
+description = '''\
+<p><code>max_adj_pair(List, Max)</code>: <code>Max</code> je največja možna vsota dveh sosednih elementov v seznamu <code>List</code>.</p>
+<pre>
+?- max_adj_pair([4.5, 3.6, 1.2, 6.7], Max).
+  Max = 8.1.
+?- max_adj_pair([1.1, 1.2, -12.3, 8.8], Max).
+  Max = 2.3.
+</pre>'''
+
+hint = {}
diff --git a/prolog/problems/clp_r/max_sum_2/common.py b/prolog/problems/clp_r/max_sum_2/common.py
deleted file mode 100644
index a5e236f..0000000
--- a/prolog/problems/clp_r/max_sum_2/common.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# coding=utf-8
-
-from operator import itemgetter
-import socket
-
-import prolog.engine
-import prolog.util
-from server.hints import Hint, HintPopup
-
-id = 156
-number = 66
-visible = True
-facts = None
-
-solution = '''\
-max_sum([_], S) :-
-    minimize(S).
-max_sum([A,B|T], S) :-
-    { S >= A + B },
-    max_sum([B|T], S).'''
-
-test_cases = [
-    ('max_sum([4.2, 5.1], X), abs(X - 9.3) =< 1e-8',
-        [{}]),
-    ('max_sum([4.5, -1.9, 1.3, -2.5, 3.5], X), abs(X - 2.6) =< 1e-8',
-        [{}]),
-    ('max_sum([7.5, 8.8, 4.2, 6.5, 2.2], X), abs(X - 16.3) =< 1e-8',
-        [{}]),
-    ('max_sum([-2.8, -2.2, 5.5, -2.2, 8.5, 0.7], X), abs(X - 9.2) =< 1e-8',
-        [{}]),
-]
-
-def test(code, aux_code):
-    n_correct = 0
-    engine_id = None
-    try:
-        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:
-                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
-                    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/clp_r/max_sum_2/en.py b/prolog/problems/clp_r/max_sum_2/en.py
deleted file mode 100644
index 269f8b3..0000000
--- a/prolog/problems/clp_r/max_sum_2/en.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# coding=utf-8
-
-name = 'max_sum/2'
-slug = 'find maximal adjacent elements'
-
-description = '''\
-<p><code>max_sum(List, Max)</code>: <code>Max</code> is the maximal sum of two adjacent elements in <code>List</code>.</p>
-<pre>
-?- max_sum([4.5, 3.6, 1.2, 6.7], Max).
-  Max = 8.1.
-?- max_sum([1.1, 1.2, -12.3, 8.8], Max).
-  Max = 2.3.
-</pre>'''
-
-hint = {}
diff --git a/prolog/problems/clp_r/max_sum_2/sl.py b/prolog/problems/clp_r/max_sum_2/sl.py
deleted file mode 100644
index b73459e..0000000
--- a/prolog/problems/clp_r/max_sum_2/sl.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# coding=utf-8
-
-name = 'max_sum/2'
-slug = 'najdi največja sosedna elementa seznama'
-
-description = '''\
-<p><code>max_sum(List, Max)</code>: <code>Max</code> je največja možna vsota dveh sosednih elementov v seznamu <code>List</code>.</p>
-<pre>
-?- max_sum([4.5, 3.6, 1.2, 6.7], Max).
-  Max = 8.1.
-?- max_sum([1.1, 1.2, -12.3, 8.8], Max).
-  Max = 2.3.
-</pre>'''
-
-hint = {}
-- 
cgit v1.2.1