X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/45951a9f688b1a3dda02979cacb93747b1422709..6ec23dc57252ffe01aa60595fc499f580381e4a9:/pypol/polyhedra.py?ds=inline

diff --git a/pypol/polyhedra.py b/pypol/polyhedra.py
index 3db8f40..2eaa7b5 100644
--- a/pypol/polyhedra.py
+++ b/pypol/polyhedra.py
@@ -6,6 +6,8 @@ import numbers
 from . import islhelper
 
 from .islhelper import mainctx, libisl
+from .geometry import GeometricObject
+from .coordinates import Point
 from .linexprs import Expression, Symbol, Rational
 from .domains import Domain
 
@@ -32,11 +34,7 @@ class Polyhedron(Domain):
             if inequalities is not None:
                 raise TypeError('too many arguments')
             return cls.fromstring(equalities)
-        elif isinstance(equalities, Polyhedron):
-            if inequalities is not None:
-                raise TypeError('too many arguments')
-            return equalities
-        elif isinstance(equalities, Domain):
+        elif isinstance(equalities, GeometricObject):
             if inequalities is not None:
                 raise TypeError('too many arguments')
             return equalities.aspolyhedron()
@@ -87,6 +85,19 @@ class Polyhedron(Domain):
     def aspolyhedron(self):
         return self
 
+    def __contains__(self, point):
+        if not isinstance(point, Point):
+            raise TypeError('point must be a Point instance')
+        if self.symbols != point.symbols:
+            raise ValueError('arguments must belong to the same space')
+        for equality in self.equalities:
+            if equality.subs(point.coordinates()) != 0:
+                return False
+        for inequality in self.inequalities:
+            if inequality.subs(point.coordinates()) < 0:
+                return False
+        return True
+
     def subs(self, symbol, expression=None):
         equalities = [equality.subs(symbol, expression)
             for equality in self.equalities]