From: Vivien Maisonneuve Date: Tue, 19 Aug 2014 13:15:27 +0000 (+0200) Subject: Remove slot Polyhedron._constraints X-Git-Tag: 1.0~44 X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/commitdiff_plain/f3795845e035704393ac7c2efdeb061df71a9b67?ds=sidebyside;hp=96f9b5ee1f7d91a25fed2b2d2a7d8edf0ef1d85c Remove slot Polyhedron._constraints --- diff --git a/linpy/polyhedra.py b/linpy/polyhedra.py index b486be1..543e673 100644 --- a/linpy/polyhedra.py +++ b/linpy/polyhedra.py @@ -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