Fix tests for Expression.subs

[linpy.git] / pypol / linexprs.py

diff --git a/pypol/linexprs.py b/pypol/linexprs.py
index 3aef337..b330045 100644 (file)
--- a/pypol/linexprs.py
+++ b/pypol/linexprs.py
@@ -9,7 +9,7 @@ from fractions import Fraction, gcd
 
 __all__ = [
     'Expression',
 
 __all__ = [
     'Expression',

-    'Symbol', 'symbols',
+    'Symbol', 'symbols', 'symbolname', 'symbolnames',

     'Constant',
 ]
 
     'Constant',
 ]
 


@@ -59,10 +59,7 @@ class Expression:
         self = object().__new__(cls)
         self._coefficients = {}
         for symbol, coefficient in coefficients:
         self = object().__new__(cls)
         self._coefficients = {}
         for symbol, coefficient in coefficients:

-            if isinstance(symbol, Symbol):
-                symbol = symbol.name
-            elif not isinstance(symbol, str):
-                raise TypeError('symbols must be strings or Symbol instances')
+            symbol = symbolname(symbol)

             if isinstance(coefficient, Constant):
                 coefficient = coefficient.constant
             if not isinstance(coefficient, numbers.Rational):
             if isinstance(coefficient, Constant):
                 coefficient = coefficient.constant
             if not isinstance(coefficient, numbers.Rational):


@@ -82,10 +79,7 @@ class Expression:
         return self
 
     def coefficient(self, symbol):
         return self
 
     def coefficient(self, symbol):

-        if isinstance(symbol, Symbol):
-            symbol = str(symbol)
-        elif not isinstance(symbol, str):
-            raise TypeError('symbol must be a string or a Symbol instance')
+        symbol = symbolname(symbol)

         try:
             return self._coefficients[symbol]
         except KeyError:
         try:
             return self._coefficients[symbol]
         except KeyError:


@@ -255,6 +249,29 @@ class Expression:
                 return left / right
         raise SyntaxError('invalid syntax')
 
                 return left / right
         raise SyntaxError('invalid syntax')
 

+    def subs(self, symbol, expression=None):
+        if expression is None:
+            if isinstance(symbol, dict):
+                symbol = symbol.items()
+            substitutions = symbol
+        else:
+            substitutions = [(symbol, expression)]
+        result = self
+        for symbol, expression in substitutions:
+            symbol = symbolname(symbol)
+            result = result._subs(symbol, expression)
+        return result
+
+    def _subs(self, symbol, expression):
+        coefficients = {name: coefficient
+            for name, coefficient in self.coefficients()
+            if name != symbol}
+        constant = self.constant
+        coefficient = self.coefficient(symbol)
+        result = Expression(coefficients, self.constant)
+        result += coefficient * expression
+        return result
+

     _RE_NUM_VAR = re.compile(r'(\d+|\))\s*([^\W\d_]\w*|\()')
 
     @classmethod
     _RE_NUM_VAR = re.compile(r'(\d+|\))\s*([^\W\d_]\w*|\()')
 
     @classmethod


@@ -339,22 +356,15 @@ class Expression:
 
 class Symbol(Expression):
 
 
 class Symbol(Expression):
 

-    __slots__ = Expression.__slots__ + (
+    __slots__ = (

         '_name',
         '_name',

+        '_hash',

     )
 
     def __new__(cls, name):
     )
 
     def __new__(cls, name):

-        if isinstance(name, Symbol):
-            name = name.name
-        elif not isinstance(name, str):
-            raise TypeError('name must be a string or a Symbol instance')
-        name = name.strip()
+        name = symbolname(name)

         self = object().__new__(cls)
         self = object().__new__(cls)

-        self._coefficients = OrderedDict([(name, 1)])
-        self._constant = 0
-        self._symbols = tuple(name)

         self._name = name
         self._name = name

-        self._dimension = 1

         self._hash = hash(self._name)
         return self
 
         self._hash = hash(self._name)
         return self
 


@@ -362,9 +372,37 @@ class Symbol(Expression):
     def name(self):
         return self._name
 
     def name(self):
         return self._name
 

+    def __hash__(self):
+        return self._hash
+
+    def coefficient(self, symbol):
+        symbol = symbolname(symbol)
+        if symbol == self.name:
+            return 1
+        else:
+            return 0
+
+    def coefficients(self):
+        yield self.name, 1
+
+    @property
+    def constant(self):
+        return 0
+
+    @property
+    def symbols(self):
+        return self.name,
+
+    @property
+    def dimension(self):
+        return 1
+

     def issymbol(self):
         return True
 
     def issymbol(self):
         return True
 

+    def __eq__(self, other):
+        return isinstance(other, Symbol) and self.name == other.name
+

     @classmethod
     def _fromast(cls, node):
         if isinstance(node, ast.Module) and len(node.body) == 1:
     @classmethod
     def _fromast(cls, node):
         if isinstance(node, ast.Module) and len(node.body) == 1:


@@ -392,24 +430,61 @@ def symbols(names):
         names = names.replace(',', ' ').split()
     return (Symbol(name) for name in names)
 
         names = names.replace(',', ' ').split()
     return (Symbol(name) for name in names)
 

+def symbolname(symbol):
+    if isinstance(symbol, str):
+        return symbol.strip()
+    elif isinstance(symbol, Symbol):
+        return symbol.name
+    else:
+        raise TypeError('symbol must be a string or a Symbol instance')
+
+def symbolnames(symbols):
+    if isinstance(symbols, str):
+        return symbols.replace(',', ' ').split()
+    return (symbolname(symbol) for symbol in symbols)
+

 
 class Constant(Expression):
 
 
 class Constant(Expression):
 

+    __slots__ = (
+        '_constant',
+        '_hash',
+    )
+

     def __new__(cls, numerator=0, denominator=None):
         self = object().__new__(cls)
         if denominator is None and isinstance(numerator, Constant):
             self._constant = numerator.constant
         else:
             self._constant = Fraction(numerator, denominator)
     def __new__(cls, numerator=0, denominator=None):
         self = object().__new__(cls)
         if denominator is None and isinstance(numerator, Constant):
             self._constant = numerator.constant
         else:
             self._constant = Fraction(numerator, denominator)

-        self._coefficients = OrderedDict()
-        self._symbols = ()
-        self._dimension = 0

         self._hash = hash(self._constant)
         return self
 
         self._hash = hash(self._constant)
         return self
 

+    def __hash__(self):
+        return self._hash
+
+    def coefficient(self, symbol):
+        symbol = symbolname(symbol)
+        return 0
+
+    def coefficients(self):
+        yield from []
+
+    @property
+    def symbols(self):
+        return ()
+
+    @property
+    def dimension(self):
+        return 0
+

     def isconstant(self):
         return True
 
     def isconstant(self):
         return True
 

+    @_polymorphic
+    def __eq__(self, other):
+        return isinstance(other, Constant) and self.constant == other.constant
+

     def __bool__(self):
         return self.constant != 0
 
     def __bool__(self):
         return self.constant != 0