From: Danielle Bolan Date: Fri, 6 Jun 2014 14:53:46 +0000 (+0200) Subject: current update:very messy and very broken! X-Git-Tag: 1.0~263 X-Git-Url: https://scm.cri.mines-paristech.fr/git/linpy.git/commitdiff_plain/23787dd83c4990ca14e52ce3ddff256e26397cdc?ds=sidebyside;hp=ddd4ffae2055577597ec46bf195bd401aaa9c625 current update:very messy and very broken! --- diff --git a/pypol/linear.py b/pypol/linear.py index a5f55fa..d1aa882 100644 --- a/pypol/linear.py +++ b/pypol/linear.py @@ -1,9 +1,17 @@ +''' +VERY MESSY, made notes on where I will change things +''' import functools import numbers +import ctypes, ctypes.util +from pypol import isl from fractions import Fraction, gcd +libisl = ctypes.CDLL(ctypes.util.find_library('isl')) + +libisl.isl_printer_get_str.restype = ctypes.c_char_p __all__ = [ 'Expression', @@ -14,6 +22,8 @@ __all__ = [ ] +_CONTEXT = isl.Context() + def _polymorphic_method(func): @functools.wraps(func) def wrapper(a, b): @@ -68,6 +78,7 @@ class Expression: self._constant = constant return self + def symbols(self): yield from sorted(self._coefficients) @@ -103,6 +114,12 @@ class Expression: yield self.coefficient(symbol) yield self.constant + def values_int(self): + for symbol in self.symbols(): + return self.coefficient(symbol) + return int(self.constant) + + def symbol(self): if not self.issymbol(): raise ValueError('not a symbol: {}'.format(self)) @@ -177,7 +194,7 @@ class Expression: return NotImplemented def __rtruediv__(self, other): - if isinstance(other, Rational): + if isinstance(other, self): if self.isconstant(): constant = Fraction(other, self.constant) return Expression(constant=constant) @@ -345,9 +362,14 @@ class Polyhedron: if value.denominator != 1: raise TypeError('non-integer constraint: ' '{} <= 0'.format(constraint)) - self._inequalities.append(constraint) - return self - + self._inequalities.append(constraint) + print('in polyhedron') + #print(self.constraints()) + self._bset = self.to_isl() + #print(self._bset) + return self + + @property def equalities(self): yield from self._equalities @@ -355,24 +377,46 @@ class Polyhedron: @property def inequalities(self): yield from self._inequalities + + @property + def constant(self): + return self._constant + + def isconstant(self): + return len(self._coefficients) == 0 + + + def isempty(self): + return bool(libisl.isl_basic_set_is_empty(self._bset)) def constraints(self): yield from self.equalities yield from self.inequalities + def symbols(self): s = set() for constraint in self.constraints(): s.update(constraint.symbols) - yield from sorted(s) - + yield from sorted(s) + + def symbol_count(self): + s = [] + for constraint in self.constraints(): + s.append(constraint.symbols) + return s + @property def dimension(self): return len(self.symbols()) def __bool__(self): # return false if the polyhedron is empty, true otherwise - raise NotImplementedError + if self._equalities or self._inequalities: + return False + else: + return True + def __contains__(self, value): # is the value in the polyhedron? @@ -381,8 +425,8 @@ class Polyhedron: def __eq__(self, other): raise NotImplementedError - def isempty(self): - return self == empty + def is_empty(self): + return def isuniverse(self): return self == universe @@ -402,6 +446,11 @@ class Polyhedron: def issuperset(self, other): # test whether every element in other is in the polyhedron + for value in other: + if value == self.constraints(): + return True + else: + return False raise NotImplementedError def __ge__(self, other): @@ -458,8 +507,36 @@ class Polyhedron: @classmethod def fromstring(cls, string): raise NotImplementedError + + 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) + 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) + print(string) + return self +empty = eq(1, 1) -empty = le(1, 0) universe = Polyhedron()