Prolog: renumber and fix CLP(FD) problems

8 files changed, 24 insertions, 26 deletions

diff --git a/prolog/problems/clp_fd/common.py b/prolog/problems/clp_fd/common.py
index f62433e..eec07f0 100644
--- a/prolog/problems/clp_fd/common.py
+++ b/prolog/problems/clp_fd/common.py
@@ -1,2 +1,2 @@
 id = 8
-number = 8
+number = 9
diff --git a/prolog/problems/clp_fd/gcd_3/common.py b/prolog/problems/clp_fd/gcd_3/common.py
index de91550..37e49d4 100644
--- a/prolog/problems/clp_fd/gcd_3/common.py
+++ b/prolog/problems/clp_fd/gcd_3/common.py
@@ -3,8 +3,8 @@ import prolog.engine
 import server.problems
 
 id = 149
-number = 61
-visible = False
+number = 60
+visible = True
 facts = None
 
 solution = '''\
diff --git a/prolog/problems/clp_fd/magic_1/common.py b/prolog/problems/clp_fd/magic_1/common.py
index 6e50198..81a6645 100644
--- a/prolog/problems/clp_fd/magic_1/common.py
+++ b/prolog/problems/clp_fd/magic_1/common.py
@@ -3,8 +3,8 @@ import prolog.engine
 import server.problems
 
 id = 151
-number = 60
-visible = False
+number = 50
+visible = True
 facts = None
 
 solution = '''\
@@ -21,14 +21,14 @@ magic(L):-
 
 test_cases = [
     ('magic(X)',
-        [{'X': '[2, 7, 6, 9, 5, 1, 4, 3, 8]'}]),
-    ('magic(X)',
-        [{'X': '[2, 9, 4, 7, 5, 3, 6, 1, 8]'}]),
-    ('setof(S, magic(S), X)',
-        [{'X': '[[2, 7, 6, 9, 5, 1, 4, 3, 8], [2, 9, 4, 7, 5, 3, 6, 1, 8], \
-                 [4, 3, 8, 9, 5, 1, 2, 7, 6], [4, 9, 2, 3, 5, 7, 8, 1, 6], \
-                 [6, 1, 8, 7, 5, 3, 2, 9, 4], [6, 7, 2, 1, 5, 9, 8, 3, 4], \
-                 [8, 1, 6, 3, 5, 7, 4, 9, 2], [8, 3, 4, 1, 5, 9, 6, 7, 2]]'}]),
+        [{'X': '[2, 7, 6, 9, 5, 1, 4, 3, 8]'},
+         {'X': '[2, 9, 4, 7, 5, 3, 6, 1, 8]'},
+         {'X': '[4, 3, 8, 9, 5, 1, 2, 7, 6]'},
+         {'X': '[4, 9, 2, 3, 5, 7, 8, 1, 6]'},
+         {'X': '[6, 1, 8, 7, 5, 3, 2, 9, 4]'},
+         {'X': '[6, 7, 2, 1, 5, 9, 8, 3, 4]'},
+         {'X': '[8, 1, 6, 3, 5, 7, 4, 9, 2]'},
+         {'X': '[8, 3, 4, 1, 5, 9, 6, 7, 2]'}]),
 ]
 
 def test(code, aux_code):
diff --git a/prolog/problems/clp_fd/puzzle_abc_3/common.py b/prolog/problems/clp_fd/puzzle_abc_3/common.py
index 1c912bc..81c4e5e 100644
--- a/prolog/problems/clp_fd/puzzle_abc_3/common.py
+++ b/prolog/problems/clp_fd/puzzle_abc_3/common.py
@@ -3,8 +3,8 @@ import prolog.engine
 import server.problems
 
 id = 153
-number = 57
-visible = False
+number = 20
+visible = True
 facts = None
 
 solution = '''\
diff --git a/prolog/problems/clp_fd/puzzle_beth_1/common.py b/prolog/problems/clp_fd/puzzle_beth_1/common.py
index dd24bb6..e187cc9 100644
--- a/prolog/problems/clp_fd/puzzle_beth_1/common.py
+++ b/prolog/problems/clp_fd/puzzle_beth_1/common.py
@@ -3,8 +3,8 @@ import prolog.engine
 import server.problems
 
 id = 155
-number = 56
-visible = False
+number = 10
+visible = True
 facts = None
 
 solution = '''\
diff --git a/prolog/problems/clp_fd/puzzle_momson_2/common.py b/prolog/problems/clp_fd/puzzle_momson_2/common.py
index 978de1f..c5fbbe5 100644
--- a/prolog/problems/clp_fd/puzzle_momson_2/common.py
+++ b/prolog/problems/clp_fd/puzzle_momson_2/common.py
@@ -3,8 +3,8 @@ import prolog.engine
 import server.problems
 
 id = 152
-number = 58
-visible = False
+number = 30
+visible = True
 facts = None
 
 solution = '''\
@@ -18,9 +18,7 @@ puzzle_momson(M, S) :-
 
 test_cases = [
     ('puzzle_momson(M, S)',
-        [{'M': '42', 'S': '24'}]),
-    ('puzzle_momson(M, S)',
-        [{'M': '51', 'S': '15'}]),
+        [{'M': '42', 'S': '24'}, {'M': '51', 'S': '15'}]),
     ('setof(M/S, puzzle_momson(M, S), X)',
         [{'X': '[42/24, 51/15]'}]),
 ]
diff --git a/prolog/problems/clp_fd/puzzle_ratio_2/common.py b/prolog/problems/clp_fd/puzzle_ratio_2/common.py
index a64aa57..8af5327 100644
--- a/prolog/problems/clp_fd/puzzle_ratio_2/common.py
+++ b/prolog/problems/clp_fd/puzzle_ratio_2/common.py
@@ -3,8 +3,8 @@ import prolog.engine
 import server.problems
 
 id = 154
-number = 59
-visible = False
+number = 40
+visible = True
 facts = None
 
 solution = '''\
diff --git a/prolog/problems/clp_fd/tobase_3/common.py b/prolog/problems/clp_fd/tobase_3/common.py
index ef1ee61..eabcad2 100644
--- a/prolog/problems/clp_fd/tobase_3/common.py
+++ b/prolog/problems/clp_fd/tobase_3/common.py
@@ -3,8 +3,8 @@ import prolog.engine
 import server.problems
 
 id = 150
-number = 62
-visible = False
+number = 70
+visible = True
 facts = None
 
 solution = '''\