projects
/
linpy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
96f9b5e
)
Remove slot Polyhedron._constraints
author
Vivien Maisonneuve
<v.maisonneuve@gmail.com>
Tue, 19 Aug 2014 13:15:27 +0000
(15:15 +0200)
committer
Vivien Maisonneuve
<v.maisonneuve@gmail.com>
Tue, 19 Aug 2014 13:15:27 +0000
(15:15 +0200)
linpy/polyhedra.py
patch
|
blob
|
history
diff --git
a/linpy/polyhedra.py
b/linpy/polyhedra.py
index
b486be1
..
543e673
100644
(file)
--- a/
linpy/polyhedra.py
+++ b/
linpy/polyhedra.py
@@
-44,7
+44,6
@@
class Polyhedron(Domain):
__slots__ = (
'_equalities',
'_inequalities',
__slots__ = (
'_equalities',
'_inequalities',
- '_constraints',
'_symbols',
'_dimension',
)
'_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.
"""
The tuple of constraints, i.e., equalities and inequalities. This is
semantically equivalent to: equalities + inequalities.
"""
- return self._
constraint
s
+ return self._
equalities + self._inequalitie
s
@property
def polyhedra(self):
@property
def polyhedra(self):
@@
-219,8
+218,7
@@
class Polyhedron(Domain):
self = object().__new__(Polyhedron)
self._equalities = tuple(equalities)
self._inequalities = tuple(inequalities)
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
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 = object().__new__(cls)
self._equalities = (Rational(1),)
self._inequalities = ()
- self._constraints = self._equalities
self._symbols = ()
self._dimension = 0
return self
self._symbols = ()
self._dimension = 0
return self
@@
-344,7
+341,6
@@
class UniverseType(Polyhedron):
self = object().__new__(cls)
self._equalities = ()
self._inequalities = ()
self = object().__new__(cls)
self._equalities = ()
self._inequalities = ()
- self._constraints = ()
self._symbols = ()
self._dimension = ()
return self
self._symbols = ()
self._dimension = ()
return self