projects
/
linpy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the order of elements in __init__.py
[linpy.git]
/
linpy
/
polyhedra.py
diff --git
a/linpy/polyhedra.py
b/linpy/polyhedra.py
index
50af053
..
b88cfd1
100644
(file)
--- a/
linpy/polyhedra.py
+++ b/
linpy/polyhedra.py
@@
-173,7
+173,11
@@
class Polyhedron(Domain):
for inequality in self.inequalities]
return Polyhedron(equalities, inequalities)
for inequality in self.inequalities]
return Polyhedron(equalities, inequalities)
- def _asinequalities(self):
+ def asinequalities(self):
+ """
+ Express the polyhedron using inequalities, given as a list of
+ expressions greater or equal to 0.
+ """
inequalities = list(self.equalities)
inequalities.extend([-expression for expression in self.equalities])
inequalities.extend(self.inequalities)
inequalities = list(self.equalities)
inequalities.extend([-expression for expression in self.equalities])
inequalities.extend(self.inequalities)
@@
-188,8
+192,8
@@
class Polyhedron(Domain):
"""
if not isinstance(other, Polyhedron):
raise TypeError('argument must be a Polyhedron instance')
"""
if not isinstance(other, Polyhedron):
raise TypeError('argument must be a Polyhedron instance')
- inequalities1 = self.
_
asinequalities()
- inequalities2 = other.
_
asinequalities()
+ inequalities1 = self.asinequalities()
+ inequalities2 = other.asinequalities()
inequalities = []
for inequality1 in inequalities1:
if other <= Polyhedron(inequalities=[inequality1]):
inequalities = []
for inequality1 in inequalities1:
if other <= Polyhedron(inequalities=[inequality1]):