X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/blobdiff_plain/dba7d8fa774455d02d3cd3e0ab740fa9a727e4bb..ce31a1de5082c55b5eed1825ae95d827c55a8b92:/pypol/domains.py

diff --git a/pypol/domains.py b/pypol/domains.py
index 45040c8..5d98af8 100644
--- a/pypol/domains.py
+++ b/pypol/domains.py
@@ -5,7 +5,9 @@ import re
 from fractions import Fraction
 
 from . import islhelper
-from .islhelper import mainctx, libisl, isl_set_basic_sets
+from .islhelper import mainctx, libisl
+from .geometry import GeometricObject
+from .coordinates import Point
 from .linexprs import Expression, Symbol
 
 
@@ -16,7 +18,7 @@ __all__ = [
 
 
 @functools.total_ordering
-class Domain:
+class Domain(GeometricObject):
 
     __slots__ = (
         '_polyhedra',
@@ -27,14 +29,14 @@ class Domain:
     def __new__(cls, *polyhedra):
         from .polyhedra import Polyhedron
         if len(polyhedra) == 1:
-            polyhedron = polyhedra[0]
-            if isinstance(polyhedron, str):
-                return cls.fromstring(polyhedron)
-            elif isinstance(polyhedron, Polyhedron):
-                return polyhedron
+            argument = polyhedra[0]
+            if isinstance(argument, str):
+                return cls.fromstring(argument)
+            elif isinstance(argument, GeometricObject):
+                return argument.aspolyhedron()
             else:
                 raise TypeError('argument must be a string '
-                    'or a Polyhedron instance')
+                    'or a GeometricObject instance')
         else:
             for polyhedron in polyhedra:
                 if not isinstance(polyhedron, Polyhedron):
@@ -153,6 +155,9 @@ class Domain:
         islbset = libisl.isl_set_polyhedral_hull(islset)
         return Polyhedron._fromislbasicset(islbset, self.symbols)
 
+    def asdomain(self):
+        return self
+
     def project(self, dims):
         # use to remove certain variables
         islset = self._toislset(self.polyhedra, self.symbols)
@@ -268,7 +273,7 @@ class Domain:
         points = []
         for vertex in vertices:
             expr = libisl.isl_vertex_get_expr(vertex)
-            point = {}
+            coordinates = []
             if islhelper.isl_version < '0.13':
                 constraints = islhelper.isl_basic_set_constraints(expr)
                 for constraint in constraints:
@@ -280,7 +285,7 @@ class Domain:
                         coefficient = islhelper.isl_val_to_int(coefficient)
                         if coefficient != 0:
                             coordinate = -Fraction(constant, coefficient)
-                            point[symbol]= coordinate
+                            coordinates.append((symbol, coordinate))
             else:
                 # horrible hack, find a cleaner solution
                 string = islhelper.isl_multi_aff_to_str(expr)
@@ -290,8 +295,8 @@ class Domain:
                     denominator = match.group('den')
                     denominator = 1 if denominator is None else int(denominator)
                     coordinate = Fraction(numerator, denominator)
-                    point[symbol] = coordinate
-            points.append(point)
+                    coordinates.append((symbol, coordinate))
+            points.append(Point(coordinates))
         return points
 
     def points(self):
@@ -302,15 +307,21 @@ class Domain:
         islpoints = islhelper.isl_set_points(islset)
         points = []
         for islpoint in islpoints:
-            point = {}
+            coordinates = {}
             for index, symbol in enumerate(self.symbols):
                 coordinate = libisl.isl_point_get_coordinate_val(islpoint,
                     libisl.isl_dim_set, index)
                 coordinate = islhelper.isl_val_to_int(coordinate)
-                point[symbol] = coordinate
-            points.append(point)
+                coordinates[symbol] = coordinate
+            points.append(Point(coordinates))
         return points
 
+    def __contains__(self, point):
+        for polyhedron in self.polyhedra:
+            if point in polyhedron:
+                return True
+        return False
+
     def subs(self, symbol, expression=None):
         polyhedra = [polyhedron.subs(symbol, expression)
             for polyhedron in self.polyhedra]
@@ -320,7 +331,7 @@ class Domain:
     def _fromislset(cls, islset, symbols):
         from .polyhedra import Polyhedron
         islset = libisl.isl_set_remove_divs(islset)
-        islbsets = isl_set_basic_sets(islset)
+        islbsets = islhelper.isl_set_basic_sets(islset)
         libisl.isl_set_free(islset)
         polyhedra = []
         for islbset in islbsets: