Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
16203: preliminary implementation, dependent on 17399, 17438
Browse files Browse the repository at this point in the history
  • Loading branch information
rwst committed Dec 3, 2014
1 parent 32ae67c commit 0a43e21
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
4 changes: 4 additions & 0 deletions src/sage/rings/power_series_ring.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
import integral_domain
import field
import integer
from sage.symbolic.expression import Expression
import sage.structure.parent_gens as gens
from infinity import infinity
import sage.misc.latex as latex
Expand Down Expand Up @@ -724,6 +725,9 @@ def _element_constructor_(self, f, prec=infinity, check=True):
num = self.element_class(self, f.numerator(), prec, check=check)
den = self.element_class(self, f.denominator(), prec, check=check)
return self.coerce(num/den)
elif isinstance(f, Expression) and f.is_series():
return self.element_class(self, f.list(),
f.degree(f.default_variable()), check=check)
return self.element_class(self, f, prec, check=check)

def construction(self):
Expand Down
4 changes: 3 additions & 1 deletion src/sage/symbolic/ring.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ from sage.structure.parent_base import ParentWithBase
from sage.rings.ring cimport CommutativeRing
from sage.categories.morphism cimport Morphism

from sage.rings.all import RR, CC
from sage.rings.real_mpfr import RR
from sage.rings.complex_field import ComplexField
CC = ComplexField()

pynac_symbol_registry = {}

Expand Down

0 comments on commit 0a43e21

Please sign in to comment.