diff --git a/python/nontransitive_dice.py b/python/nontransitive_dice.py index 6ca335ca57..930f690035 100644 --- a/python/nontransitive_dice.py +++ b/python/nontransitive_dice.py @@ -133,11 +133,11 @@ def main(m=3, n=6, minimize_val=0): # and now we roll... # Number of wins for [A vs B, B vs A] for d in range(m): - b1 = [solver.MakeIsGreaterVar(dice[d % m, r1], dice[(d+1) % m, r2]) + b1 = [solver.IsGreaterVar(dice[d % m, r1], dice[(d+1) % m, r2]) for r1 in range(n) for r2 in range(n)] solver.Add(comp[d%m,0] == solver.Sum(b1)) - b2 = [solver.MakeIsGreaterVar(dice[(d+1) % m, r1], dice[d % m, r2]) + b2 = [solver.IsGreaterVar(dice[(d+1) % m, r1], dice[d % m, r2]) for r1 in range(n) for r2 in range(n)] solver.Add(comp[d%m,1] == solver.Sum(b2)) diff --git a/python/organize_day.py b/python/organize_day.py index 4fb0550026..72521f2a99 100644 --- a/python/organize_day.py +++ b/python/organize_day.py @@ -39,8 +39,8 @@ from constraint_solver import pywrapcp # No overlapping of tasks s1 and s2 # def no_overlap(solver, s1, d1, s2, d2): - b1 = solver.MakeIsLessOrEqualVar(s1 + d1, s2) # s1 + d1 <= s2 - b2 = solver.MakeIsLessOrEqualVar(s2 + d2, s1) # s2 + d2 <= s1 + b1 = solver.IsLessOrEqualVar(s1 + d1, s2) # s1 + d1 <= s2 + b2 = solver.IsLessOrEqualVar(s2 + d2, s1) # s2 + d2 <= s1 solver.Add(b1 + b2 >= 1)