X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/24e1cba2b462f9507db3db51952fb5d236792b6b..716fef940d54c340234d568b292b1c03cdefe049:/linpy/polyhedra.py?ds=sidebyside

diff --git a/linpy/polyhedra.py b/linpy/polyhedra.py
index 31b64b1..b88cfd1 100644
--- a/linpy/polyhedra.py
+++ b/linpy/polyhedra.py
@@ -144,6 +144,15 @@ class Polyhedron(Domain):
     def aspolyhedron(self):
         return self
 
+    def convex_union(self, *others):
+        """
+        Return the convex union of two or more polyhedra.
+        """
+        for other in others:
+            if not isinstance(other, Polyhedron):
+                raise TypeError('arguments must be Polyhedron instances')
+        return Polyhedron(self.union(*others))
+
     def __contains__(self, point):
         if not isinstance(point, Point):
             raise TypeError('point must be a Point instance')
@@ -164,7 +173,11 @@ class Polyhedron(Domain):
             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)
@@ -178,9 +191,9 @@ class Polyhedron(Domain):
         used on large polyhedra.
         """
         if not isinstance(other, Polyhedron):
-            raise ValueError('argument must be a Polyhedron instance')
-        inequalities1 = self._asinequalities()
-        inequalities2 = other._asinequalities()
+            raise TypeError('argument must be a Polyhedron instance')
+        inequalities1 = self.asinequalities()
+        inequalities2 = other.asinequalities()
         inequalities = []
         for inequality1 in inequalities1:
             if other <= Polyhedron(inequalities=[inequality1]):
@@ -399,15 +412,15 @@ def Ne(left, right):
     return ~Eq(left, right)
 
 @_polymorphic
-def Gt(left, right):
+def Ge(left, right):
     """
-    Create the polyhedron with constraints expr1 > expr2 > expr3 ...
+    Create the polyhedron with constraints expr1 >= expr2 >= expr3 ...
     """
-    return Polyhedron([], [left - right - 1])
+    return Polyhedron([], [left - right])
 
 @_polymorphic
-def Ge(left, right):
+def Gt(left, right):
     """
-    Create the polyhedron with constraints expr1 >= expr2 >= expr3 ...
+    Create the polyhedron with constraints expr1 > expr2 > expr3 ...
     """
-    return Polyhedron([], [left - right])
+    return Polyhedron([], [left - right - 1])