Ticket #1963: kedlaya2.patch

sage/rings/padics/local_generic_element.pyx

@@ -282 +282 @@
     #def valuation(self):
     #    raise NotImplementedError
 
+    def normalized_valuation(self):
+        r"""
+        Returns the normalized valuation of this local ring element,
+        i.e., the valuation divided by the absolute ramification index.
+
+        INPUT:
+            self -- a local ring element.
+
+        OUTPUT:
+            rational -- the normalized valuation of self.
+
+        EXAMPLES:
+            sage: Q7 = Qp(7)
+            sage: R.<x> = Q7[]
+            sage: F.<z> = Q7.ext(x^3+7*x+7)
+            sage: z.normalized_valuation()
+            1/3
+        """
+        F = self.parent()
+        return self.valuation()/F.ramification_index()
+
     def _min_valuation(self):
         r"""
         Returns the valuation of this local ring element.

sage/rings/padics/padic_ZZ_pX_CA_element.pyx

@@ -168 +168 @@
                 aprec = mpz_get_si((<Integer>absprec).value)
                 if aprec > self.prime_pow.ram_prec_cap:
                     aprec = self.prime_pow.ram_prec_cap
-        if relprec is not infinity:
+        if relprec is infinity:
+            # This might not be the right default
+            rprec = self.prime_pow.ram_prec_cap            
+        else:
             if not PY_TYPE_CHECK(relprec, Integer):
-                relprec = Integer(relprec)
+                rprec = Integer(relprec)
             if mpz_cmp_ui((<Integer>relprec).value, aprec) >= 0:
-                relprec = infinity
+                rprec = self.prime_pow.ram_prec_cap
             elif relprec < 0:
                 rprec = 0
             else: