index ac67cf8..63ecb64 100644 (file)
@@ -4,7 +4,7 @@ import numbers
from . import islhelper

from .islhelper import mainctx, libisl
-from .linexprs import Expression, Constant
+from .linexprs import Expression, Rational
from .domains import Domain

@@ -37,21 +37,21 @@ class Polyhedron(Domain):
elif isinstance(equalities, Domain):
if inequalities is not None:
raise TypeError('too many arguments')
-            return equalities.polyhedral_hull()
+            return equalities.aspolyhedron()
if equalities is None:
equalities = []
else:
for i, equality in enumerate(equalities):
if not isinstance(equality, Expression):
raise TypeError('equalities must be linear expressions')
-                equalities[i] = equality._toint()
+                equalities[i] = equality.scaleint()
if inequalities is None:
inequalities = []
else:
for i, inequality in enumerate(inequalities):
if not isinstance(inequality, Expression):
raise TypeError('inequalities must be linear expressions')
-                inequalities[i] = inequality._toint()
+                inequalities[i] = inequality.scaleint()
symbols = cls._xsymbols(equalities + inequalities)
islbset = cls._toislbasicset(equalities, inequalities, symbols)
return cls._fromislbasicset(islbset, symbols)
@@ -82,9 +82,16 @@ class Polyhedron(Domain):
libisl.isl_basic_set_free(islbset)
return universe

-    def polyhedral_hull(self):
+    def aspolyhedron(self):
return self

+    def subs(self, symbol, expression=None):
+        equalities = [equality.subs(symbol, expression)
+            for equality in self.equalities]
+        inequalities = [inequality.subs(symbol, expression)
+            for inequality in self.inequalities]
+        return Polyhedron(equalities, inequalities)
+
@classmethod
def _fromislbasicset(cls, islbset, symbols):
islconstraints = islhelper.isl_basic_set_constraints(islbset)
@@ -95,7 +102,8 @@ class Polyhedron(Domain):
constant = islhelper.isl_val_to_int(constant)
coefficients = {}
for index, symbol in enumerate(symbols):
-                coefficient = libisl.isl_constraint_get_coefficient_val(islconstraint, libisl.isl_dim_set, index)
+                coefficient = libisl.isl_constraint_get_coefficient_val(islconstraint,
+                    libisl.isl_dim_set, index)
coefficient = islhelper.isl_val_to_int(coefficient)
if coefficient != 0:
coefficients[symbol] = coefficient
@@ -163,46 +171,20 @@ class Polyhedron(Domain):
else:
strings = []
for equality in self.equalities:
-                strings.append('Eq({}, 0)'.format(equality))
+                strings.append('0 == {}'.format(equality))
for inequality in self.inequalities:
-                strings.append('Ge({}, 0)'.format(inequality))
+                strings.append('0 <= {}'.format(inequality))
if len(strings) == 1:
return strings
else:
return 'And({})'.format(', '.join(strings))

-    @classmethod
-    def _fromsympy(cls, expr):
-        import sympy
-        equalities = []
-        inequalities = []
-        if expr.func == sympy.And:
-            for arg in expr.args:
-                arg_eqs, arg_ins = cls._fromsympy(arg)
-                equalities.extend(arg_eqs)
-                inequalities.extend(arg_ins)
-        elif expr.func == sympy.Eq:
-            expr = Expression.fromsympy(expr.args - expr.args)
-            equalities.append(expr)
-        else:
-            if expr.func == sympy.Lt:
-                expr = Expression.fromsympy(expr.args - expr.args - 1)
-            elif expr.func == sympy.Le:
-                expr = Expression.fromsympy(expr.args - expr.args)
-            elif expr.func == sympy.Ge:
-                expr = Expression.fromsympy(expr.args - expr.args)
-            elif expr.func == sympy.Gt:
-                expr = Expression.fromsympy(expr.args - expr.args - 1)
-            else:
-                raise ValueError('non-polyhedral expression: {!r}'.format(expr))
-            inequalities.append(expr)
-        return equalities, inequalities
-
@classmethod
def fromsympy(cls, expr):
-        import sympy
-        equalities, inequalities = cls._fromsympy(expr)
-        return cls(equalities, inequalities)
+        domain = Domain.fromsympy(expr)
+        if not isinstance(domain, Polyhedron):
+            raise ValueError('non-polyhedral expression: {!r}'.format(expr))
+        return domain

def tosympy(self):
import sympy
@@ -218,12 +200,12 @@ def _polymorphic(func):
@functools.wraps(func)
def wrapper(left, right):
if isinstance(left, numbers.Rational):
-            left = Constant(left)
+            left = Rational(left)
elif not isinstance(left, Expression):
raise TypeError('left must be a a rational number '
'or a linear expression')
if isinstance(right, numbers.Rational):
-            right = Constant(right)
+            right = Rational(right)
elif not isinstance(right, Expression):
raise TypeError('right must be a a rational number '
'or a linear expression')