fix .value()

CPMpy · May 10, 2024 · b38bcae · b38bcae
1 parent 81a3b7f
commit b38bcae
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/cpmpy/expressions/globalconstraints.py b/cpmpy/expressions/globalconstraints.py
@@ -532,12 +532,12 @@ def decompose(self):
             2) empty list of defining constraints
         """
         args = self.args
-        return [(args[i] <= args[i+1]) for i in range(len(args)-1)], []
+        return [args[i] <= args[i+1] for i in range(len(args)-1)], []
 
     def value(self):
         from .python_builtins import all
         args = self.args
-        return all((args[i] <= args[i+1]) for i in range(len(args)-1))
+        return all(args[i].value() <= args[i+1].value() for i in range(len(args)-1))
 
 
 class Decreasing(GlobalConstraint):
@@ -555,12 +555,12 @@ def decompose(self):
             2) empty list of defining constraints
         """
         args = self.args
-        return [(args[i] >= args[i+1]) for i in range(len(args)-1)], []
+        return [args[i] >= args[i+1] for i in range(len(args)-1)], []
 
     def value(self):
         from .python_builtins import all
         args = self.args
-        return all((args[i] >= args[i+1]) for i in range(len(args)-1))
+        return all(args[i].value() >= args[i+1].value() for i in range(len(args)-1))
 
 
 class IncreasingStrict(GlobalConstraint):
@@ -578,12 +578,12 @@ def decompose(self):
             2) empty list of defining constraints
         """
         args = self.args
-        return [(args[i] < args[i+1]) for i in range(len(args)-1)], []
+        return [args[i] < args[i+1] for i in range(len(args)-1)], []
 
     def value(self):
         from .python_builtins import all
         args = self.args
-        return all((args[i] < args[i+1]) for i in range(len(args)-1))
+        return all((args[i].value() < args[i+1].value()) for i in range(len(args)-1))
 
 
 class DecreasingStrict(GlobalConstraint):
@@ -606,7 +606,7 @@ def decompose(self):
     def value(self):
         from .python_builtins import all
         args = self.args
-        return all((args[i] > args[i+1]) for i in range(len(args)-1))
+        return all((args[i].value() > args[i+1].value()) for i in range(len(args)-1))
 
 
 class DirectConstraint(Expression):