fixed vertices pushed before adding plot

[linpy.git] / pypol / domains.py

diff --git a/pypol/domains.py b/pypol/domains.py
index fdb0ab0..44c38e7 100644 (file)
--- a/pypol/domains.py
+++ b/pypol/domains.py
@@ -260,18 +260,34 @@ class Domain:
     _RE_COORDINATE = re.compile(r'\((?P<num>\-?\d+)\)(/(?P<den>\d+))?')
 
     def vertices(self):
+        #returning list of verticies
+        from .polyhedra import Polyhedron
         islbset = self._toislbasicset(self.equalities, self.inequalities, self.symbols)
         vertices = libisl.isl_basic_set_compute_vertices(islbset);
         vertices = islhelper.isl_vertices_vertices(vertices)
-        points = []
+        points = {}
+        num = 0
+        vertices_points = []
+        symbols = list(self.symbols)
         for vertex in vertices:
-            expr = libisl.isl_vertex_get_expr(vertex);
+            expr = libisl.isl_vertex_get_expr(vertex); #make vertices a bset
             if islhelper.isl_version < '0.13':
-                string = islhelper.isl_set_to_str(expr)
-                print(string)
-                # to be continued...
+                constraints = islhelper.isl_basic_set_constraints(expr) #get bset constraints
+                for dim in symbols:
+                    index = symbols.index(dim)
+                    for c in constraints: #for each constraint 
+                        constant = libisl.isl_constraint_get_constant_val(c) #get contant 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
+                        if coefficient != 0:
+                            num = Fraction(constant, coefficient)
+                        points.update({dim:num})
+                vertices_points.append(points)
+                print(points)
+                    
             else:
-                # horrible hack, find a cleaner solution
+                points = []
                 string = islhelper.isl_multi_aff_to_str(expr)
                 matches = self._RE_COORDINATE.finditer(string)
                 point = {}
@@ -282,8 +298,8 @@ class Domain:
                     coordinate = Fraction(numerator, denominator)
                     point[symbol] = coordinate
                 points.append(point)
-        return points
-
+        return vertices_points
+    
     def points(self):
         if not self.isbounded():
             raise ValueError('domain must be bounded')
@@ -301,6 +317,11 @@ class Domain:
             points.append(point)
         return points
 
+    def subs(self, symbol, expression=None):
+        polyhedra = [polyhedron.subs(symbol, expression)
+            for polyhedron in self.polyhedra]
+        return Domain(*polyhedra)
+
     @classmethod
     def _fromislset(cls, islset, symbols):
         from .polyhedra import Polyhedron
@@ -323,6 +344,7 @@ class Domain:
             self._dimension = len(self._symbols)
             return self
 
+    @classmethod
     def _toislset(cls, polyhedra, symbols):
         polyhedron = polyhedra[0]
         islbset = polyhedron._toislbasicset(polyhedron.equalities,