Remove slot Polyhedron._constraints
authorVivien Maisonneuve <v.maisonneuve@gmail.com>
Tue, 19 Aug 2014 13:15:27 +0000 (15:15 +0200)
committerVivien Maisonneuve <v.maisonneuve@gmail.com>
Tue, 19 Aug 2014 13:15:27 +0000 (15:15 +0200)
linpy/polyhedra.py

index b486be1..543e673 100644 (file)
@@ -44,7 +44,6 @@ class Polyhedron(Domain):
     __slots__ = (
         '_equalities',
         '_inequalities',
-        '_constraints',
         '_symbols',
         '_dimension',
     )
@@ -128,7 +127,7 @@ class Polyhedron(Domain):
         The tuple of constraints, i.e., equalities and inequalities. This is
         semantically equivalent to: equalities + inequalities.
         """
-        return self._constraints
+        return self._equalities + self._inequalities
 
     @property
     def polyhedra(self):
@@ -219,8 +218,7 @@ class Polyhedron(Domain):
         self = object().__new__(Polyhedron)
         self._equalities = tuple(equalities)
         self._inequalities = tuple(inequalities)
-        self._constraints = tuple(equalities + inequalities)
-        self._symbols = cls._xsymbols(self._constraints)
+        self._symbols = cls._xsymbols(self.constraints)
         self._dimension = len(self._symbols)
         return self
 
@@ -313,7 +311,6 @@ class EmptyType(Polyhedron):
         self = object().__new__(cls)
         self._equalities = (Rational(1),)
         self._inequalities = ()
-        self._constraints = self._equalities
         self._symbols = ()
         self._dimension = 0
         return self
@@ -344,7 +341,6 @@ class UniverseType(Polyhedron):
         self = object().__new__(cls)
         self._equalities = ()
         self._inequalities = ()
-        self._constraints = ()
         self._symbols = ()
         self._dimension = ()
         return self