Rename coordinates.py into geometry.py

[linpy.git] / pypol / domains.py

diff --git a/pypol/domains.py b/pypol/domains.py
index 375be85..d80fd91 100644 (file)
--- a/pypol/domains.py
+++ b/pypol/domains.py
@@ -5,7 +5,8 @@ import re
 from fractions import Fraction
 
 from . import islhelper
 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, Point

 from .linexprs import Expression, Symbol
 
 
 from .linexprs import Expression, Symbol
 
 


@@ -16,7 +17,7 @@ __all__ = [
 
 
 @functools.total_ordering
 
 
 @functools.total_ordering

-class Domain:
+class Domain(GeometricObject):

 
     __slots__ = (
         '_polyhedra',
 
     __slots__ = (
         '_polyhedra',


@@ -27,14 +28,14 @@ class Domain:
     def __new__(cls, *polyhedra):
         from .polyhedra import Polyhedron
         if len(polyhedra) == 1:
     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 '
             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):
         else:
             for polyhedron in polyhedra:
                 if not isinstance(polyhedron, Polyhedron):


@@ -153,6 +154,9 @@ class Domain:
         islbset = libisl.isl_set_polyhedral_hull(islset)
         return Polyhedron._fromislbasicset(islbset, self.symbols)
 
         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)
     def project(self, dims):
         # use to remove certain variables
         islset = self._toislset(self.polyhedra, self.symbols)


@@ -265,37 +269,35 @@ class Domain:
         islbset = self._toislbasicset(self.equalities, self.inequalities, self.symbols)
         vertices = libisl.isl_basic_set_compute_vertices(islbset);
         vertices = islhelper.isl_vertices_vertices(vertices)
         islbset = self._toislbasicset(self.equalities, self.inequalities, self.symbols)
         vertices = libisl.isl_basic_set_compute_vertices(islbset);
         vertices = islhelper.isl_vertices_vertices(vertices)

-        points = {}
-        num = 0
-        vertices_points = []
+        points = []

         for vertex in vertices:
         for vertex in vertices:

+            expr = libisl.isl_vertex_get_expr(vertex)
+            coordinates = []

             if islhelper.isl_version < '0.13':
             if islhelper.isl_version < '0.13':

-                expr = libisl.isl_vertex_get_expr(vertex)
-                constraints = islhelper.isl_basic_set_constraints(expr) #get bset constraints
-                for index, dim in enumerate(self.symbols):
-                    for c in constraints: #for each constraint
-                        constant = libisl.isl_constraint_get_constant_val(c) #get constant value
-                        constant = islhelper.isl_val_to_int(constant)
-                        coefficient = libisl.isl_constraint_get_coefficient_val(c,libisl.isl_dim_set, index)
-                        coefficient = islhelper.isl_val_to_int(coefficient) #get coefficient
+                constraints = islhelper.isl_basic_set_constraints(expr)
+                for constraint in constraints:
+                    constant = libisl.isl_constraint_get_constant_val(constraint)
+                    constant = islhelper.isl_val_to_int(constant)
+                    for index, symbol in enumerate(self.symbols):
+                        coefficient = libisl.isl_constraint_get_coefficient_val(constraint,
+                            libisl.isl_dim_set, index)
+                        coefficient = islhelper.isl_val_to_int(coefficient)

                         if coefficient != 0:
                         if coefficient != 0:

-                            num = -Fraction(constant, coefficient)
-                            points[dim]= float(num)
-                vertices_points.append(points.copy())
+                            coordinate = -Fraction(constant, coefficient)
+                            coordinates.append((symbol, coordinate))

             else:
             else:

-                points = []
+                # horrible hack, find a cleaner solution

                 string = islhelper.isl_multi_aff_to_str(expr)
                 matches = self._RE_COORDINATE.finditer(string)
                 string = islhelper.isl_multi_aff_to_str(expr)
                 matches = self._RE_COORDINATE.finditer(string)

-                point = {}

                 for symbol, match in zip(self.symbols, matches):
                     numerator = int(match.group('num'))
                     denominator = match.group('den')
                     denominator = 1 if denominator is None else int(denominator)
                     coordinate = Fraction(numerator, denominator)
                 for symbol, match in zip(self.symbols, matches):
                     numerator = int(match.group('num'))
                     denominator = match.group('den')
                     denominator = 1 if denominator is None else int(denominator)
                     coordinate = Fraction(numerator, denominator)

-                    point[symbol] = coordinate
-                points.append(point)
-        return vertices_points
-    
+                    coordinates.append((symbol, coordinate))
+            points.append(Point(coordinates))
+        return points
+

     def points(self):
         if not self.isbounded():
             raise ValueError('domain must be bounded')
     def points(self):
         if not self.isbounded():
             raise ValueError('domain must be bounded')


@@ -304,15 +306,21 @@ class Domain:
         islpoints = islhelper.isl_set_points(islset)
         points = []
         for islpoint in islpoints:
         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)
             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
 
         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]
     def subs(self, symbol, expression=None):
         polyhedra = [polyhedron.subs(symbol, expression)
             for polyhedron in self.polyhedra]


@@ -322,7 +330,7 @@ class Domain:
     def _fromislset(cls, islset, symbols):
         from .polyhedra import Polyhedron
         islset = libisl.isl_set_remove_divs(islset)
     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:
         libisl.isl_set_free(islset)
         polyhedra = []
         for islbset in islbsets: