X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/76c0aa89c5a4008aaf0de557dd659917518aa41a..3bbc19830f1dc2432f91bba40123bb60936a0be3:/pypol/linear.py diff --git a/pypol/linear.py b/pypol/linear.py index 07c6293..8e96f35 100644 --- a/pypol/linear.py +++ b/pypol/linear.py @@ -4,8 +4,8 @@ import numbers from fractions import Fraction, gcd -from . import isl, islhelper -from .isl import libisl, Context, BasicSet +from . import isl +from .isl import libisl __all__ = [ @@ -42,7 +42,7 @@ def _polymorphic_operator(func): return wrapper -_main_ctx = Context() +_main_ctx = isl.Context() class Expression: @@ -516,7 +516,7 @@ class Polyhedron: for eq in coeff_eq: num = coeff_eq.get(eq) iden = symbols.index(eq) - ceq = libisl.isl_constraint_set_coefficient_si(ceq, islhelper.isl_dim_set, iden, num) #use 3 for type isl_dim_set + ceq = libisl.isl_constraint_set_coefficient_si(ceq, libisl.isl_dim_set, iden, num) #use 3 for type isl_dim_set bset = libisl.isl_basic_set_add_constraint(bset, ceq) if list(self.inequalities): #check if any inequalities exist for ineq in self.inequalities: @@ -527,9 +527,9 @@ class Polyhedron: for ineq in coeff_in: num = coeff_in.get(ineq) iden = symbols.index(ineq) - cin = libisl.isl_constraint_set_coefficient_si(cin, islhelper.isl_dim_set, iden, num) #use 3 for type isl_dim_set + cin = libisl.isl_constraint_set_coefficient_si(cin, libisl.isl_dim_set, iden, num) #use 3 for type isl_dim_set bset = libisl.isl_basic_set_add_constraint(bset, cin) - bset = BasicSet(bset) + bset = isl.BasicSet(bset) return bset def from_isl(self, bset):