X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/blobdiff_plain/5c08207a9606e513944a4ba01e6674ee8e13508a..56ab422e3bbc5a6a072f5b2a5be9d88d1017f03f:/pypol/linear.py diff --git a/pypol/linear.py b/pypol/linear.py index 75ae166..621a157 100644 --- a/pypol/linear.py +++ b/pypol/linear.py @@ -11,7 +11,7 @@ __all__ = [ 'Expression', 'Constant', 'Symbol', 'symbols', 'eq', 'le', 'lt', 'ge', 'gt', 'Polyhedron', - 'empty', 'universe' + 'Empty', 'Universe' ] @@ -69,7 +69,7 @@ class Expression: self._coefficients = {} for symbol, coefficient in coefficients: if isinstance(symbol, Symbol): - symbol = str(symbol) + symbol = symbol.name elif not isinstance(symbol, str): raise TypeError('symbols must be strings or Symbol instances') if isinstance(coefficient, Constant): @@ -126,10 +126,6 @@ class Expression: yield self.coefficient(symbol) yield self.constant - @property - def symbol(self): - raise ValueError('not a symbol: {}'.format(self)) - def issymbol(self): return False @@ -330,26 +326,26 @@ class Symbol(Expression): def __new__(cls, name): if isinstance(name, Symbol): - name = name.symbol + name = name.name elif not isinstance(name, str): raise TypeError('name must be a string or a Symbol instance') self = object().__new__(cls) self._coefficients = {name: 1} self._constant = 0 self._symbols = tuple(name) - self._symbol = name + self._name = name self._dimension = 1 return self @property - def symbol(self): - return self._symbol + def name(self): + return self._name def issymbol(self): return True def __repr__(self): - return '{}({!r})'.format(self.__class__.__name__, self._symbol) + return '{}({!r})'.format(self.__class__.__name__, self._name) def symbols(names): if isinstance(names, str): @@ -527,7 +523,7 @@ class Polyhedron: other = other._toisl(symbols) difference = libisl.isl_set_subtract(bset, other) return difference - + def __sub__(self, other): return self.difference(other) @@ -541,10 +537,15 @@ class Polyhedron: return '{{{}}}'.format(', '.join(constraints)) def __repr__(self): - equalities = list(self.equalities) - inequalities = list(self.inequalities) - return '{}(equalities={!r}, inequalities={!r})' \ - ''.format(self.__class__.__name__, equalities, inequalities) + if self.isempty(): + return 'Empty' + elif self.isuniverse(): + return 'Universe' + else: + equalities = list(self.equalities) + inequalities = list(self.inequalities) + return '{}(equalities={!r}, inequalities={!r})' \ + ''.format(self.__class__.__name__, equalities, inequalities) def _symbolunion(self, *others): symbols = set(self.symbols) @@ -572,7 +573,7 @@ class Polyhedron: num = libisl.isl_val_read_from_str(_main_ctx, number) iden = symbols.index(eq) ceq = libisl.isl_constraint_set_coefficient_val(ceq, libisl.isl_dim_set, iden, num) #use 3 for type isl_dim_set - bset = libisl.isl_basic_set_add_constraint(bset, ceq) + bset = libisl.isl_basic_set_add_constraint(bset, ceq) for ineq in self.inequalities: cin = libisl.isl_inequality_alloc(libisl.isl_local_space_copy(ls)) coeff_in = dict(ineq.coefficients()) @@ -585,7 +586,7 @@ class Polyhedron: num = libisl.isl_val_read_from_str(_main_ctx, number) iden = symbols.index(ineq) cin = libisl.isl_constraint_set_coefficient_val(cin, libisl.isl_dim_set, iden, num) #use 3 for type isl_dim_set - bset = libisl.isl_basic_set_add_constraint(bset, cin) + bset = libisl.isl_basic_set_add_constraint(bset, cin) bset = isl.BasicSet(bset) return bset @@ -601,8 +602,8 @@ class Polyhedron: our printer is giving form as: { [i0, i1] : 2i1 >= -2 - i0 } ''' -empty = None #eq(0,1) -universe = None #Polyhedron() +Empty = eq(0,1) +Universe = Polyhedron() if __name__ == '__main__': ex1 = Expression(coefficients={'a': 6, 'b': 6}, constant= 3) #this is the expression that does not work (even without adding values)