Refactoring

Author: lecoutre

academic/BIBD/BIBD.py

@@ -50,6 +50,8 @@
 
 from pycsp3 import *
 
+assert not variant() or variant("aux")
+
 v, b, r, k, ld = data or (6, 0, 0, 3, 8)
 b = (ld * v * (v - 1)) // (k * (k - 1)) if b == 0 else b  # when specified at 0, b is automatically computed
 r = (ld * (v - 1)) // (k - 1) if r == 0 else r  # when specified at 0, r is automatically computed

academic/ChainReaction/ChainReaction.py

@@ -27,6 +27,8 @@
 
 from pycsp3 import *
 
+assert not variant() or variant("opt") or variant("mini")
+
 n, k = data or (20, 100)
 
 # x[i] is the ith value of the chain

academic/ChangeMaking/ChangeMaking.py

@@ -31,6 +31,8 @@
 
 from pycsp3 import *
 
+assert not variant() or variant("compact")
+
 k = data or 13
 
 if not variant():

academic/Charlotte/Charlotte.py

@@ -22,7 +22,10 @@
 from pycsp3 import *
 import random
 
+assert not variant() or variant("mini")
+
 nWeeks, seed = data or (6, 0)
+
 nNurses = 3
 assert nWeeks % nNurses == 0
 nDays = nWeeks * 7

academic/ClockTriplet/ClockTriplet.py

@@ -35,6 +35,7 @@
 from pycsp3 import *
 
 r, n = data or (3, 12)
+
 ub = sum(n - v for v in range(r))
 
 # x[i] is the ith number in the circle

academic/Coprime/Coprime.py

@@ -22,21 +22,12 @@
 ## Tags
   academic, xcsp25
 """
-from reportlab.lib.pagesizes import elevenSeventeen
 
 from pycsp3 import *
 
-n = data
-D = range(2, n * n + 1)
-
-cache = {}
-
-
-def T(d):
-    if d not in cache:
-        cache[d] = [(u, v) for u in D for v in D if u % d != 0 or v % d != 0]
-    return cache[d]
+n = data or 10
 
+D = range(2, n * n + 1)
 
 # x[i] is the value of the ith element of the coprime set
 x = VarArray(size=n, dom=D)
@@ -45,18 +36,34 @@ def T(d):
     # setting a lower-bound
     [x[i] >= x[-1] // 2 for i in range(n - 1)],
 
-    # ensuring that we have coprime integers
-    [(x[i], x[j]) in T(d) for i, j in combinations(n, 2) for d in D] if variant("table") else
-    [
+    # tag(symmetry-breaking)
+    Increasing(x, strict=True)
+)
+
+if variant("table"):
+    cache = {}
+
+
+    def T(d):
+        if d not in cache:
+            cache[d] = [(u, v) for u in D for v in D if u % d != 0 or v % d != 0]
+        return cache[d]
+
+
+    satisfy(
+        # ensuring that we have coprime integers
+        (x[i], x[j]) in T(d) for i, j in combinations(n, 2) for d in D
+    )
+
+else:
+    satisfy(
+        # ensuring that we have coprime integers
         either(
             x[i] % d != 0,
             x[j] % d != 0
         ) for i, j in combinations(n, 2) for d in D
-    ],
 
-    # tag(symmetry-breaking)
-    Increasing(x, strict=True)
-)
+    )
 
 minimize(
     # minimizing the highest value of the set

academic/CostasArray/CostasArray_z.py

@@ -18,14 +18,14 @@
 
 ## Links
   - https://mathworld.wolfram.com/CostasArray.html
-  - https://www.minizinc.org/challenge2015/results2015.html
+  - https://www.minizinc.org/challenge/2015/results/
 
 ## Tags
   academic, mzn10, mzn11, mzn15
 """
 from pycsp3 import *
 
-n = data
+n = data or 15
 
 # x[i] is the ith value of the Costas array
 x = VarArray(size=n, dom=range(1, n + 1))

academic/CryptoPuzzle/CryptoPuzzle.py

@@ -38,7 +38,10 @@
 
 from pycsp3 import *
 
+assert not variant() or variant("carry")
+
 word1, word2, word3 = words = [w.lower() for w in data] if data else ("no", "no", "yes")
+
 n = len(word1)
 assert len(word2) == n and len(word3) in {n, n + 1}
 

academic/DeBruijn/DeBruijn.py

@@ -21,15 +21,16 @@
   - https://en.wikipedia.org/wiki/De_Bruijn_sequence
   - https://mathworld.wolfram.com/deBruijnSequence.html
   - http://www.hakank.org/common_cp_models/#debruijn
-  - https://www.minizinc.org/challenge2008/results2008.html
+  - https://www.minizinc.org/challenge/2008/results/
 
 ## Tags
   academic, mzn08
 """
 
 from pycsp3 import *
 
-b, n = data
+b, n = data or (3, 6)
+
 m = b ** n
 powers = [b ** i for i in range(n - 1, -1, -1)]
 

academic/Domino/Domino.py

@@ -24,7 +24,7 @@
 
 from pycsp3 import *
 
-n, d = data  # number of dominoes and number of values
+n, d = data or (100, 6)  # number of dominoes and number of values
 
 # x[i] is the value of the ith domino
 x = VarArray(size=n, dom=range(d))