X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/a4a564b4061ca0a495f2f2dba784d28b685b6f1d..b4f536e238161d59db61f4bb5fc6e87d4b7baffe:/linpy/linexprs.py diff --git a/linpy/linexprs.py b/linpy/linexprs.py index d62c671..d2554a0 100644 --- a/linpy/linexprs.py +++ b/linpy/linexprs.py @@ -339,7 +339,7 @@ class LinExpr: Create an expression from a string. Raise SyntaxError if the string is not properly formatted. """ - # add implicit multiplication operators, e.g. '5x' -> '5*x' + # Add implicit multiplication operators, e.g. '5x' -> '5*x'. string = LinExpr._RE_NUM_VAR.sub(r'\1*\2', string) tree = ast.parse(string, 'eval') expr = cls._fromast(tree) @@ -416,7 +416,8 @@ class LinExpr: if symbol == sympy.S.One: constant = coefficient elif isinstance(symbol, sympy.Dummy): - # we cannot properly convert dummy symbols + # We cannot properly convert dummy symbols with respect to + # symbol equalities. raise TypeError('cannot convert dummy symbols') elif isinstance(symbol, sympy.Symbol): symbol = Symbol(symbol.name) @@ -450,6 +451,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. @@ -470,6 +478,8 @@ class Symbol(LinExpr): @property def _coefficients(self): + # This is not implemented as an attribute, because __hash__ is not + # callable in __new__ in class Dummy. return {self: Fraction(1)} @property @@ -582,6 +592,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 = {}