From: Danielle Bolan Date: Wed, 11 Jun 2014 09:07:50 +0000 (+0200) Subject: no bugs in eclipse update X-Git-Tag: 1.0~261 X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/commitdiff_plain/2849330c65ff7bbc0bfefddf0f062fce51bde7b9 no bugs in eclipse update --- diff --git a/pypol/linear.py b/pypol/linear.py index d1aa882..2b064d4 100644 --- a/pypol/linear.py +++ b/pypol/linear.py @@ -1,7 +1,3 @@ -''' -VERY MESSY, made notes on where I will change things -''' - import functools import numbers import ctypes, ctypes.util @@ -404,6 +400,7 @@ class Polyhedron: s = [] for constraint in self.constraints(): s.append(constraint.symbols) + print(s) return s @property @@ -508,33 +505,51 @@ class Polyhedron: def fromstring(cls, string): raise NotImplementedError + def printer(self): + + ip = libisl.isl_printer_to_str(_CONTEXT) + ip = libisl.isl_printer_print_val(ip, self) + string = libisl.isl_printer_get_str(ip).decode() + print(string) + return string + + def to_isl(self): space = libisl.isl_space_set_alloc(_CONTEXT, 0, len(self.symbol_count())) - bset = libisl.isl_basic_set_universe(libisl.isl_space_copy(space)) - copy = libisl.isl_basic_set_copy(bset) + bset = libisl.isl_basic_set_empty(libisl.isl_space_copy(space)) ls = libisl.isl_local_space_from_space(libisl.isl_space_copy(space)) ceq = libisl.isl_equality_alloc(libisl.isl_local_space_copy(ls)) - for value in self.equalities: - for value in self.equalities: - #need method to get expression value - if self._equalities: - value = self._equalities.method_get_value_from_expression() - ceq = libisl.isl_constraint_set_constant_val(ceq, value ) - #ceq = libisl.isl_constraint_set_coefficient_si(ceq, libisl.isl_set_dim, self.symbols(), value) - ''' cin = libisl.isl_inequality_alloc(libisl.isl_local_space_copy(ls)) - for item in self.inequalities: - for item in self.inequalities: - if isinstance(item, int): - cin = libisl.isl_constraint_set_constant_si(cin, item) - else: - cin = libisl.isl_constraint_set_coefficient_si(cin, libisl.isl_set_dim, self.symbols(), item) - ''' - bsetfinal = libisl.isl_basic_set_add_contraint(copy, ceq) - #bsetfinal = libisl.isl_basic_set_add_contraint(copy, cin) - string = libisl.isl_printer_print_basic_set(bsetfinal) + dict_ex = Expression().__dict__ + ''' + if there are equalities/inequalities, take each constant and coefficient and add as a constraint to the basic set + need to change the symbols method to a lookup table for the integer value for each letter that could be a symbol + ''' + if self.equalities: + for _constant in dict_ex: + value = dict_ex.get('_constant') + ceq = libisl.isl_constraint_set_constant_val(ceq, value) + for _coefficients in dict_ex: + value_co = dict_ex.get('_coefficients') + if value_co: + ceq = libisl.isl_constraint_set_coefficient_si(ceq, libisl.isl_set_dim, self.symbols(), value_co) + bset = libisl.isl_set_add_constraint(bset, ceq) + + elif self.inequalities: + for _constant in dict_ex: + value = dict_ex.get('_constant') + cin = libisl.isl_constraint_set_constant_val(cin, value) + for _coefficients in dict_ex: + value_co = dict_ex.get('_coefficients') + if value_co: + cin = libisl.isl_constraint_set_coefficient_si(cin, libisl.isl_set_dim, self.symbols(), value_co) + bset = libisl.isl_set_add_contraint(bset, cin) + string = self.printer() + #string = libisl.isl_printer_print_basic_set(bset) + print('here') print(string) - return self + print(self) + return string empty = eq(1, 1)