Fix implementation of Polyhedron.__new__()

[linpy.git] / linpy / polyhedra.py

diff --git a/linpy/polyhedra.py b/linpy/polyhedra.py
index b486be1..8426d32 100644 (file)
--- a/linpy/polyhedra.py
+++ b/linpy/polyhedra.py
@@ -44,7 +44,6 @@ class Polyhedron(Domain):
     __slots__ = (
         '_equalities',
         '_inequalities',
-        '_constraints',
         '_symbols',
         '_dimension',
     )
@@ -88,22 +87,20 @@ class Polyhedron(Domain):
             if inequalities is not None:
                 raise TypeError('too many arguments')
             return equalities.aspolyhedron()
-        if equalities is None:
-            equalities = []
-        else:
-            for i, equality in enumerate(equalities):
+        sc_equalities = []
+        if equalities is not None:
+            for equality in equalities:
                 if not isinstance(equality, LinExpr):
                     raise TypeError('equalities must be linear expressions')
-                equalities[i] = equality.scaleint()
-        if inequalities is None:
-            inequalities = []
-        else:
-            for i, inequality in enumerate(inequalities):
+                sc_equalities.append(equality.scaleint())
+        sc_inequalities = []
+        if inequalities is not None:
+            for inequality in inequalities:
                 if not isinstance(inequality, LinExpr):
                     raise TypeError('inequalities must be linear expressions')
-                inequalities[i] = inequality.scaleint()
-        symbols = cls._xsymbols(equalities + inequalities)
-        islbset = cls._toislbasicset(equalities, inequalities, symbols)
+                sc_inequalities.append(inequality.scaleint())
+        symbols = cls._xsymbols(sc_equalities + sc_inequalities)
+        islbset = cls._toislbasicset(sc_equalities, sc_inequalities, symbols)
         return cls._fromislbasicset(islbset, symbols)
 
     @property
@@ -128,7 +125,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 +216,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 +309,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 +339,6 @@ class UniverseType(Polyhedron):
         self = object().__new__(cls)
         self._equalities = ()
         self._inequalities = ()
-        self._constraints = ()
         self._symbols = ()
         self._dimension = ()
         return self