Changeset 8428:228224d8ccf5

Timestamp:

11/11/07 14:22:37 (6 years ago)

Author:

David Roe <roed@…>

Branch:

default

Message:

Updating some padic parents.

Location:

sage/rings/padics

Files:

• padic_extension_generic.py (modified) (1 diff)
• padic_extension_leaves.py (modified) (5 diffs)
• padic_generic.py (modified) (7 diffs)

sage/rings/padics/padic_extension_generic.py

@@ -33 +33 @@
 
     def gen(self, n=0):
-        if n != 0:
-            raise IndexError, "extension has only one generator"
-        #this won't work for padic_general extensions
-        return self(self._PQR.polynomial_ring().gen())
+        raise NotImplementedError
 
     def defining_polynomial(self):

sage/rings/padics/padic_extension_leaves.py

@@ +1 @@
+from pow_computer_ext import PowComputer_ext_maker
+from sage.libs.ntl.ntl_ZZ_pX import ntl_ZZ_pX
+
 from unramified_extension_generic import UnramifiedExtensionGeneric
 from eisenstein_extension_generic import EisensteinExtensionGeneric
@@ -10 +13 @@
 from padic_fixed_mod_ring_generic import pAdicFixedModRingGeneric
 
+from padic_ring_fixed_mod import pAdicRingFixedMod
+
 from unramified_extension_absolute_element import UnramifiedExtensionAbsoluteElement
 from unramified_extension_capped_relative_element import UnramifiedExtensionCappedRelativeElement
@@ -19 +24 @@
 from padic_general_extension_capped_relative_element import pAdicGeneralExtensionCappedRelativeElement
 from padic_general_extension_lazy_element import pAdicGeneralExtensionLazyElement
+
+from unramified_fixed_mod_element import UnramifiedFixedModElement
+from eisenstein_fixed_mod_element import EisensteinFixedModElement
+
+from sage.rings.integer_ring import ZZ
 
 class UnramifiedExtensionRingCappedRelative(UnramifiedExtensionGeneric, pAdicCappedRelativeRingGeneric):
@@ -44 +54 @@
 class UnramifiedExtensionRingFixedMod(UnramifiedExtensionGeneric, pAdicFixedModRingGeneric):
     def __init__(self, poly, prec, halt, print_mode, names):
-        UnramifiedExtensionGeneric.__init__(self, poly, prec, print_mode, names, UnramifiedExtensionAbsoluteElement)
+        ntl_poly = ntl_ZZ_pX([a.lift() for a in poly.list()], poly.base_ring().prime()**prec)
+        self.prime_pow = PowComputer_ext_maker(poly.base_ring().prime(), max(min(prec - 1, 30), 1), prec, False, ntl_poly, "FM", "u")
+        UnramifiedExtensionGeneric.__init__(self, poly, prec, print_mode, names, UnramifiedFixedModElement)
+
+    def coerce_map_explicit(self, S):
+        from sage.rings.padics.morphism import Morphism_ZZ_UnrFM, Morphism_ZpFM_UnrFM
+        if S is ZZ:
+            return Morphism_ZZ_UnrFM(self)
+        elif isinstance(S, pAdicRingFixedMod) and S.prime() == self.prime():
+            return Morphism_ZpFM_UnrFM(S, self)
+        return None
 
 class EisensteinExtensionRingCappedRelative(EisensteinExtensionGeneric, pAdicCappedRelativeRingGeneric):
@@ -70 +90 @@
 class EisensteinExtensionRingFixedMod(EisensteinExtensionGeneric, pAdicFixedModRingGeneric):
     def __init__(self, poly, prec, halt, print_mode, names):
-        EisensteinExtensionGeneric.__init__(self, poly, prec, print_mode, names, EisensteinExtensionAbsoluteElement)
+        prec = prec // poly.degree()
+        ntl_poly = ntl_ZZ_pX([a.lift() for a in poly.list()], poly.base_ring().prime()**prec)
+        #print poly.base_ring().prime(), prec, poly.degree(), ntl_poly
+        # deal with prec not a multiple of e better.
+        self.prime_pow = PowComputer_ext_maker(poly.base_ring().prime(), max(min(prec - 1, 30), 1), prec, False, ntl_poly, "FM", "e")
+        EisensteinExtensionGeneric.__init__(self, poly, prec, print_mode, names, EisensteinFixedModElement)
+
+    def coerce_map_explicit(self, S):
+        from sage.rings.padics.morphism import Morphism_ZZ_EisFM, Morphism_ZpFM_EisFM
+        if S is ZZ:
+            return Morphism_ZZ_EisFM(self)
+        elif isinstance(S, pAdicRingFixedMod) and S.prime() == self.prime():
+            return Morphism_ZpFM_EisFM(S, self)
+        return None
+
+    # Temp fix
+    def gen(self, n=0):
+        if n != 0:
+            raise IndexError, "extension has only one generator"
+        #this won't work for padic_general extensions
+        return self([0,1])
+
 
 class pAdicGeneralExtensionRingCappedRelative(pAdicGeneralExtensionGeneric, pAdicCappedRelativeRingGeneric):

sage/rings/padics/padic_generic.py

@@ -58 +58 @@
 import sage.rings.ring
 
-from sage.rings.padics.pow_computer import PowComputer
 from sage.rings.integer import Integer
+from sage.rings.padics.padic_printing import pAdicPrinter
 
 infinity = sage.rings.infinity.infinity
@@ -72 +72 @@
         #else:
         #    self.prime_pow = PowComputer(p, 3, prec, self.is_field())
-        self.prime_pow = PowComputer(p, max(min(prec - 1, 30), 1), prec, self.is_field())
-        self.__set_print_mode(print_mode)
+        self._printer = pAdicPrinter(self, print_mode, True, None, None, None)
         self._element_class = element_class
 
@@ -136 +135 @@
             'series'
         """
-        return self._print_mode
-
-    def __set_print_mode(self, print_mode):
-        """
-        Sets the print mode.
+        return self._printer._print_mode()
+
+#     def __set_print_mode(self, print_mode):
+#         """
+#         Sets the print mode.
     
-        WARNING: You should not use this function.
-
-        INPUT:
-            self -- a p-adic ring
-            print_mode -- string (see NOTES)
+#         WARNING: You should not use this function.
+
+#         INPUT:
+#             self -- a p-adic ring
+#             print_mode -- string (see NOTES)
     
-        NOTES:
-            The options for print_mode are:
-            'val-unit' -- elements are displayed as p^k*u
-            'terse' -- elements are displayed as an integer if positive valuation, as u/ppow or u/p^k if negative valuation
-            'series' -- elements are displayed as series in p, where p is self.variable_name() (default, e.g., "5")
-        """
-        if (print_mode in ['val-unit', 'terse', 'series']):
-            try:
-                old = self._print_mode
-                self._print_mode = print_mode
-                return old
-            except AttributeError:
-                self._print_mode = print_mode
-        else:
-            raise ValueError, "print_mode=%s must be either val-unit, terse, series"%print_mode
+#         NOTES:
+#             The options for print_mode are:
+#             'val-unit' -- elements are displayed as p^k*u
+#             'terse' -- elements are displayed as an integer if positive valuation, as u/ppow or u/p^k if negative valuation
+#             'series' -- elements are displayed as series in p, where p is self.variable_name() (default, e.g., "5")
+#         """
+#         if (print_mode in ['val-unit', 'terse', 'series']):
+#             try:
+#                 old = self._print_mode
+#                 self._print_mode = print_mode
+#                 return old
+#             except AttributeError:
+#                 self._print_mode = print_mode
+#         else:
+#             raise ValueError, "print_mode=%s must be either val-unit, terse, series"%print_mode
         
     def _element_class(self):
@@ -201 +200 @@
 
     def uniformizer_pow(self, n):
+        """
+        Returns p^n, as an element of self.
+
+        If n is infinity, returns 0.
+
+        EXAMPLES:
+        sage: R = Zp(3, 5, 'fixed-mod')
+        sage: R.uniformizer_pow(3)
+        27
+        sage: R.uniformizer_pow(infinity)
+        0
+        """
         if n is infinity:
             return self(0)
-        return self.uniformizer()**n
+        return self(self.prime_pow.pow_Integer_Integer(n))
+
+    def _unram_print(self):
+        """
+        For printing.  Will be None if the unramified subextension of self is of degree 1 over Z_p or Q_p.
+        """
+        return None
 
     def residue_characteristic(self):
@@ -504 +521 @@
             NotImplementedError: This is not yet ready for general use.
         """
-        raise NotImplementedError, "This is not yet ready for general use."
         if not self is modulus.base_ring():
             modulus = modulus.parent().change_ring(self)(modulus)
@@ -512 +528 @@
     ext = extension
 
-class local_print_mode:
+def local_print_mode(obj, print_mode, pos = None, uniformizer_name = None):
     r"""
     Context manager for safely temporarily changing the print_mode
@@ -528 +544 @@
     NOTES:  For more documentation see localvars in parent_gens.pyx
     """
-    def __init__(self, obj, print_mode):
-        self._obj = obj
-        self._print_mode = print_mode
-
-    def __enter__(self):
-        self._orig = self._obj._pAdicGeneric__set_print_mode(self._print_mode)
-
-    def __exit__(self, type, value, traceback):
-        self._obj._pAdicGeneric__set_print_mode(self._orig)
+    if pos is None:
+        pos = obj._printer._pos()
+    if uniformizer_name is None:
+        uniformizer_name = obj._printer._uniformizer_name()
+    return pAdicPrinter(obj, print_mode, pos, uniformizer_name)