Changeset 7430:5dac436ac13b

Timestamp:

11/30/07 14:55:09 (6 years ago)

Author:

Mike Hansen <mhansen@…>

Branch:

default

Message:

Fixed #1345.

Location:

sage

Files:

• calculus/calculus.py (modified) (2 diffs)
• functions/constants.py (modified) (2 diffs)

sage/calculus/calculus.py

@@ -340 +340 @@
             sage: a.parent()
             Symbolic Ring
+            sage: type(SR(I))
+            <class 'sage.calculus.calculus.SymbolicConstant'>
+            sage: is_SymbolicExpression(SR(I))
+            True
 
         If a is already in the symblic expression ring, coercing returns
@@ -350 +354 @@
             2.00000000000000 - 3.00000000000000*I
         """
-        if is_Element(x) and x.parent() is self:
+        if is_SymbolicExpression(x):
             return x
         elif hasattr(x, '_symbolic_'):

sage/functions/constants.py

@@ -255 +255 @@
 ######################
 import sage.calculus.calculus
+SR = sage.calculus.calculus.SR
 
 class Constant(Function):
@@ -316 +317 @@
     # The following adds formal arithmetic support for generic constant
     def _add_(self, right):
-        return self._ser() + right
+        """
+        EXAMPLES:
+            sage: I + 2
+            I + 2
+            sage: a = I+I
+            sage: map(type, a._operands)
+            [<class 'sage.calculus.calculus.SymbolicConstant'>,
+             <class 'sage.calculus.calculus.SymbolicConstant'>]
+        """
+        return self._ser() + SR(right)
 
     def _sub_(self, right):
-        return self._ser() - right
+        """
+        EXAMPLES:
+            sage: a = I - pi; a
+            I - pi
+            sage: map(type, a._operands)
+            [<class 'sage.calculus.calculus.SymbolicConstant'>,
+             <class 'sage.calculus.calculus.SymbolicConstant'>]
+        """
+        return self._ser() - SR(right)
 
     def _mul_(self, right):
-        return self._ser() * right
+        """
+        EXAMPLES:
+            sage: a = I * pi; a
+            I*pi
+            sage: map(type, a._operands)
+            [<class 'sage.calculus.calculus.SymbolicConstant'>,
+             <class 'sage.calculus.calculus.SymbolicConstant'>]
+        """
+        return self._ser() * SR(right)
 
     def _div_(self, right):
-        return self._ser() / right
+        """
+        EXAMPLES:
+            sage: a = I / pi; a
+            I/pi
+            sage: map(type, a._operands)
+            [<class 'sage.calculus.calculus.SymbolicConstant'>,
+             <class 'sage.calculus.calculus.SymbolicConstant'>]
+
+        """
+        return self._ser() / SR(right)
 
     def __pow__(self, right):
-        return self._ser() ** right
+        """
+        EXAMPLES:
+            sage: a = pi^pi; a
+            pi^pi
+            sage: map(type, a._operands)
+            [<class 'sage.calculus.calculus.SymbolicConstant'>,
+             <class 'sage.calculus.calculus.SymbolicConstant'>]
+        """
+        return self._ser() ** SR(right)
 
     def _interface_is_cached_(self):