X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/ba88e64fedc541e9e3766e258a6cfa051acf56d9..538cd0d05962f48885e8dd68c93a0a1af67b9607:/linpy/linexprs.py?ds=sidebyside diff --git a/linpy/linexprs.py b/linpy/linexprs.py index b97f048..c100698 100644 --- a/linpy/linexprs.py +++ b/linpy/linexprs.py @@ -450,6 +450,13 @@ class Symbol(LinExpr): Two instances of Symbol are equal if they have the same name. """ + __slots__ = ( + '_name', + '_constant', + '_symbols', + '_dimension', + ) + def __new__(cls, name): """ Return a symbol with the name string given in argument. @@ -463,12 +470,15 @@ class Symbol(LinExpr): raise SyntaxError('invalid syntax') self = object().__new__(cls) self._name = name - self._coefficients = {self: Fraction(1)} self._constant = Fraction(0) self._symbols = (self,) self._dimension = 1 return self + @property + def _coefficients(self): + return {self: Fraction(1)} + @property def name(self): """ @@ -553,15 +563,8 @@ class Dummy(Symbol): """ if name is None: name = 'Dummy_{}'.format(Dummy._count) - elif not isinstance(name, str): - raise TypeError('name must be a string') - self = object().__new__(cls) + self = super().__new__(cls, name) self._index = Dummy._count - self._name = name.strip() - self._coefficients = {self: Fraction(1)} - self._constant = Fraction(0) - self._symbols = (self,) - self._dimension = 1 Dummy._count += 1 return self @@ -586,6 +589,13 @@ class Rational(LinExpr, Fraction): fractions.Fraction classes. """ + __slots__ = ( + '_coefficients', + '_constant', + '_symbols', + '_dimension', + ) + Fraction.__slots__ + def __new__(cls, numerator=0, denominator=None): self = object().__new__(cls) self._coefficients = {}