Version 1.0.1

[linpy.git] / linpy / domains.py

diff --git a/linpy/domains.py b/linpy/domains.py
index 1f7a190..f26b2fc 100644 (file)
--- a/linpy/domains.py
+++ b/linpy/domains.py
@@ -235,7 +235,7 @@ class Domain(GeometricObject):
         Return an equivalent domain, whose polyhedra are disjoint.
         """
         islset = self._toislset(self.polyhedra, self.symbols)
         Return an equivalent domain, whose polyhedra are disjoint.
         """
         islset = self._toislset(self.polyhedra, self.symbols)

-        islset = libisl.isl_set_make_disjoint(mainctx, islset)
+        islset = libisl.isl_set_make_disjoint(islset)

         return self._fromislset(islset, self.symbols)
 
     def coalesce(self):
         return self._fromislset(islset, self.symbols)
 
     def coalesce(self):


@@ -411,10 +411,10 @@ class Domain(GeometricObject):
         vertices = islhelper.isl_vertices_vertices(vertices)
         points = []
         for vertex in vertices:
         vertices = islhelper.isl_vertices_vertices(vertices)
         points = []
         for vertex in vertices:

-            expr = libisl.isl_vertex_get_expr(vertex)
+            expression = libisl.isl_vertex_get_expr(vertex)

             coordinates = []
             if self._RE_COORDINATE is None:
             coordinates = []
             if self._RE_COORDINATE is None:

-                constraints = islhelper.isl_basic_set_constraints(expr)
+                constraints = islhelper.isl_basic_set_constraints(expression)

                 for constraint in constraints:
                     constant = libisl.isl_constraint_get_constant_val(constraint)
                     constant = islhelper.isl_val_to_int(constant)
                 for constraint in constraints:
                     constant = libisl.isl_constraint_get_constant_val(constraint)
                     constant = islhelper.isl_val_to_int(constant)


@@ -426,7 +426,7 @@ class Domain(GeometricObject):
                             coordinate = -Fraction(constant, coefficient)
                             coordinates.append((symbol, coordinate))
             else:
                             coordinate = -Fraction(constant, coefficient)
                             coordinates.append((symbol, coordinate))
             else:

-                string = islhelper.isl_multi_aff_to_str(expr)
+                string = islhelper.isl_multi_aff_to_str(expression)

                 matches = self._RE_COORDINATE.finditer(string)
                 for symbol, match in zip(self.symbols, matches):
                     numerator = int(match.group('num'))
                 matches = self._RE_COORDINATE.finditer(string)
                 for symbol, match in zip(self.symbols, matches):
                     numerator = int(match.group('num'))


@@ -729,14 +729,8 @@ class Domain(GeometricObject):
         strings = [repr(polyhedron) for polyhedron in self.polyhedra]
         return 'Or({})'.format(', '.join(strings))
 
         strings = [repr(polyhedron) for polyhedron in self.polyhedra]
         return 'Or({})'.format(', '.join(strings))
 

-    def _repr_latex_(self):
-        strings = []
-        for polyhedron in self.polyhedra:
-            strings.append('({})'.format(polyhedron._repr_latex_().strip('$')))
-        return '${}$'.format(' \\vee '.join(strings))
-

     @classmethod
     @classmethod

-    def fromsympy(cls, expr):
+    def fromsympy(cls, expression):

         """
         Create a domain from a SymPy expression.
         """
         """
         Create a domain from a SymPy expression.
         """


@@ -748,12 +742,12 @@ class Domain(GeometricObject):
             sympy.Eq: Eq, sympy.Ne: Ne,
             sympy.Ge: Ge, sympy.Gt: Gt,
         }
             sympy.Eq: Eq, sympy.Ne: Ne,
             sympy.Ge: Ge, sympy.Gt: Gt,
         }

-        if expr.func in funcmap:
-            args = [Domain.fromsympy(arg) for arg in expr.args]
-            return funcmap[expr.func](*args)
-        elif isinstance(expr, sympy.Expr):
-            return LinExpr.fromsympy(expr)
-        raise ValueError('non-domain expression: {!r}'.format(expr))
+        if expression.func in funcmap:
+            args = [Domain.fromsympy(arg) for arg in expression.args]
+            return funcmap[expression.func](*args)
+        elif isinstance(expression, sympy.Expr):
+            return LinExpr.fromsympy(expression)
+        raise ValueError('non-domain expression: {!r}'.format(expression))

 
     def tosympy(self):
         """
 
     def tosympy(self):
         """