remove unnecessary aux vars in value calculation

CPMpy · May 13, 2024 · 6870a91 · 6870a91
1 parent 01c53f5
commit 6870a91
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/cpmpy/expressions/globalconstraints.py b/cpmpy/expressions/globalconstraints.py
@@ -178,8 +178,7 @@ def decompose(self):
         return [var1 != var2 for var1, var2 in all_pairs(self.args)], []
 
     def value(self):
-        values = argvals(self.args)
-        return len(set(values)) == len(self.args)
+        return len(set(argvals(self.args))) == len(self.args)
 
 
 class AllDifferentExcept0(GlobalConstraint):
@@ -194,8 +193,7 @@ def decompose(self):
         return [(var1 == var2).implies(var1 == 0) for var1, var2 in all_pairs(self.args)], []
 
     def value(self):
-        vals = [argval(a) for a in self.args if argval(a) != 0]
-        return len(set(vals)) == len(vals)
+        return len(set([argval(a) for a in self.args if argval(a) != 0])) == len(vals)
 
 def allequal(args):
     warnings.warn("Deprecated, use AllEqual(v1,v2,...,vn) instead, will be removed in stable version", DeprecationWarning)
@@ -215,8 +213,7 @@ def decompose(self):
         return [var1 == var2 for var1, var2 in zip(self.args[:-1], self.args[1:])], []
 
     def value(self):
-        values = argvals(self.args)
-        return len(set(values)) == 1
+        return len(set(argvals(self.args))) == 1
 
 def circuit(args):
     warnings.warn("Deprecated, use Circuit(v1,v2,...,vn) instead, will be removed in stable version", DeprecationWarning)