Changeset 8446:f935df1e363c

Timestamp:

01/27/08 18:10:31 (5 years ago)

Author:

David Roe <roed@…>

Branch:

default

Message:

Working on adding capped relative extension elements.

Files:

• c_lib/include/ntl_wrap.h (modified) (1 diff)
• c_lib/src/ntl_wrap.cpp (modified) (2 diffs)
• sage/libs/ntl/decl.pxi (modified) (3 diffs)
• sage/rings/padics/eisenstein_capped_relative_element.pyx (added)
• sage/rings/padics/eisenstein_fixed_mod_element.pyx (modified) (1 diff)
• sage/rings/padics/padic_ZZ_pX_CR_element.pyx (modified) (2 diffs)
• sage/rings/padics/padic_capped_relative_element.pyx (modified) (5 diffs)
• sage/rings/padics/unramified_capped_relative_element.pyx (added)
• setup.py (modified) (1 diff)

c_lib/include/ntl_wrap.h

@@ -200 +200 @@
 EXTERN void ZZ_pX_right_pshift(struct ZZ_pX &x, const struct ZZ_pX &a, const struct ZZ &pn, const struct ZZ_pContext &c);
 EXTERN void ZZ_pX_InvMod_newton(struct ZZ_pX &x, const struct ZZ_pX &a, const struct ZZ_pXModulus &F, const struct ZZ_pContext &cpn, const struct ZZ_pContext &cp);
-EXTERN void ZZ_pX_eis_shift(struct ZZ_pX &x, const struct ZZ_pX &a, long n, const struct ZZ_pXMultiplier* low_shifter, const struct ZZ_pXMultiplier* high_shifter, const struct ZZ_pXModulus &modulus, const struct ZZ &p, const struct ZZ_pContext &cupper, const struct ZZ_pContext &clower);
+EXTERN void ZZ_pX_eis_shift(struct ZZ_pX &x, const struct ZZ_pX &a, long n, const struct ZZ_pXMultiplier* low_shifter, const struct ZZ_pXMultiplier* high_shifter, const struct ZZ_pXModulus &modulus, const struct ZZ &p, const struct ZZ_pContext &clower);
+
 #endif
 

c_lib/src/ntl_wrap.cpp

@@ -1117 +1117 @@
 {
         ctx->restore();
+}
+
+// Functions for using ZZ_pX's for p-adic extensions
+
+void ZZ_pX_conv_modulus(ZZ_pX &fout, const ZZ_pX &fin, const ZZ_pContext &modout)
+{ 
+    // Changes the modulus of fin to modout, and puts the result in fout.
+    long i, n;
+
+    n = fin.rep.length();
+    fout.rep.SetLength(n);
+
+    ZZ_p* xp = fout.rep.elts();
+    const ZZ_p* ap = fin.rep.elts();
+
+    // I think it's enough to just restore modout once.
+    // This should be true as long as the function rep taking a ZZ_p as an argument
+    // and returning a ZZ works when the ZZ_p::modulus is incorrect.
+    modout.restore();
+
+    for (i = 0; i < n; i++)
+    {
+        conv(xp[i], rep(ap[i]));
+    }
+    
+    // We may have set a leading coefficient to 0, so we have to normalize
+    fout.normalize();
+}
+
+void ZZ_pEX_conv_modulus(ZZ_pEX &fout, const ZZ_pEX &fin, const ZZ_pContext &modout)
+{
+    // Changes the modulus of fin to modout, and puts the result in fout.
+    long i, n, j, m;
+
+    n = fin.rep.length();
+    fout.rep.SetLength(n);
+
+    ZZ_pE* outpe = fout.rep.elts();
+    const ZZ_pE* inpe = fin.rep.elts();
+
+    ZZ_p* xp;
+    const ZZ_p* ap;
+    // I think it's enough to just restore modout once
+    // This should be true as long as Loophole() offers access to
+    // the underlying ZZ_pX representations of ZZ_pEs,
+    // and rep of a ZZ_p (giving a ZZ) works even if the ZZ_p::modulus is
+    // incorrect
+    modout.restore();
+
+    for (i = 0; i < n; i++)
+    {
+        m = rep(inpe[i]).rep.length();
+        outpe[i]._ZZ_pE__rep.rep.SetLength(m);
+
+        xp = outpe[i]._ZZ_pE__rep.rep.elts();
+        ap = rep(inpe[i]).rep.elts();
+
+        for (j = 0; j < m; j++)
+            conv(xp[j], rep(ap[j]));
+
+        // We may have set a leading coefficient to 0, so we have to normalize
+        outpe[i]._ZZ_pE__rep.normalize();
+    }
+    // We may have set a leading coefficient to 0, so we have to normalize
+    fout.normalize();
+}
+
+void ZZ_pX_min_val_coeff(long & valuation, long &index, const struct ZZ_pX &f, const struct ZZ &p)
+{
+    // Sets index, where the indexth coefficient of f has the minimum p-adic valuation.
+    // Sets valuation to be this valuation.
+    // If there are ties, index will be the lowest of the tied indices
+    // This only makes mathematical sense when p divides the modulus of f.
+    long i, n, v;
+
+    n = f.rep.length();
+    if (n == 0)
+    {
+        index = -1;
+        return;
+    }
+
+    const ZZ_p* fp = f.rep.elts();
+    ZZ *u = new ZZ();
+
+    valuation = -1;
+    i = 0;
+
+    while (valuation == -1)
+    {
+        if (rep(fp[i]) != 0)
+        {
+            index = i;
+            valuation = ZZ_remove(*u, rep(fp[i]), p);
+        }
+        i++;
+    }
+    for (; i < n; i++)
+    {
+        if (rep(fp[i]) != 0)
+        {
+            v = ZZ_remove(*u, rep(fp[i]), p);
+            if (v < valuation)
+            {
+                valuation = v;
+                index = i;
+            }
+        }
+    }
+    delete u;
+}
+
+long ZZ_pX_get_val_coeff(const struct ZZ_pX &f, const struct ZZ &p, long i)
+{
+    // Gets the p-adic valuation of the ith coefficient of f.
+    ZZ *u = new ZZ();
+    long ans = ZZ_remove(*u, rep(coeff(f, i)), p);
+    delete u;
+}
+
+void ZZ_pX_left_pshift(struct ZZ_pX &x, const struct ZZ_pX &a, const struct ZZ &pn, const struct ZZ_pContext &c)
+{
+    // Multiplies each coefficient by pn, and sets the context of the answer to c.
+
+    long i, n;
+
+    n = a.rep.length();
+    x.rep.SetLength(n);
+
+    ZZ_p* xp = x.rep.elts();
+    const ZZ_p* ap = a.rep.elts();
+
+    // I think it's enough to just restore modout once.
+    // This should be true as long as the function rep taking a ZZ_p as an argument
+    // and returning a ZZ works when the ZZ_p::modulus is incorrect.
+    c.restore();
+
+    for (i = 0; i < n; i++)
+    {
+        conv(xp[i], rep(ap[i]) * pn);
+    }
+    
+    // We may have set a leading coefficient to 0, so we have to normalize
+    x.normalize();    
+}
+
+void ZZ_pX_right_pshift(struct ZZ_pX &x, const struct ZZ_pX &a, const struct ZZ &pn, const struct ZZ_pContext &c)
+{
+    // Divides each coefficient by pn, and sets the context of the answer to c.
+
+    long i, n;
+
+    n = a.rep.length();
+    x.rep.SetLength(n);
+
+    ZZ_p* xp = x.rep.elts();
+    const ZZ_p* ap = a.rep.elts();
+
+    // I think it's enough to just restore modout once.
+    // This should be true as long as the function rep taking a ZZ_p as an argument
+    // and returning a ZZ works when the ZZ_p::modulus is incorrect.
+    c.restore();
+
+    for (i = 0; i < n; i++)
+    {
+        conv(xp[i], rep(ap[i]) / pn);
+    }
+    
+    // We may have set a leading coefficient to 0, so we have to normalize
+    x.normalize();    
+}
+
+void ZZ_pX_InvMod_newton(struct ZZ_pX &x, const struct ZZ_pX &a, const struct ZZ_pXModulus &F, const struct ZZ_pContext &cpn, const struct ZZ_pContext &cp)
+{
+    int j;
+    cp.restore();
+    ZZ_pX *amodp = new ZZ_pX();
+    ZZ_pX *xmodp = new ZZ_pX();
+    ZZ_pX *fmodp = new ZZ_pX();
+    ZZ_pX_conv_modulus(*amodp, a, cp);
+    ZZ_pX_conv_modulus(*fmodp, F.val(), cp);
+    InvMod(*xmodp, *amodp, *fmodp);
+    //cout << "xmodp: " << *xmodp << "\namodp: " << *amodp << "\nfmodp: " << *fmodp << "\n";
+    cpn.restore();
+    ZZ_pX *minusa = new ZZ_pX();
+    ZZ_pX *xn = new ZZ_pX();
+    ZZ_pX_conv_modulus(*xn, *xmodp, cpn);
+    negate(*minusa, a);
+    do
+    {
+        *xn = x;
+        // x_n = 2*x_{n-1} - a*x_{n-1}^2 = (2 - a*x_{n-1})*x_{n-1}
+        MulMod(x, *minusa, *xn, F);
+        SetCoeff(x, 0, ConstTerm(x) + 2);
+        MulMod(x, x, *xn, F);
+        //cout << "x: " << x << "\nxn: " << *xn << "\n";
+        //cin >> j;
+    } while (x != (*xn));
+    delete amodp;
+    delete xmodp;
+    delete fmodp;
+    delete minusa;
+    delete xn;
+}
+
+void ZZ_pX_eis_shift(struct ZZ_pX &x, const struct ZZ_pX &a, long n, const struct ZZ_pXMultiplier* low_shifter, const struct ZZ_pXMultiplier* high_shifter, const struct ZZ_pXModulus &modulus, const struct ZZ &p, const struct ZZ_pContext &clower)
+{
+    long degree = deg(modulus);
+    long pshift = n / degree;
+    long eis_part = n % degree;
+    long two_shift = 1;
+    int i;
+
+    //cout << "eis_part: " << eis_part << "\n";
+    //cout << "pshift: " << pshift << "\n";
+    ZZ_pX low_part; // = new ZZ_pX();
+    ZZ_pX shifted_high_part; // = new ZZ_pX();
+    x = a;
+    //cout << "beginning: a = " << a << "\n";
+    if (pshift)
+    {
+        i = 0;
+        two_shift = 1;
+        ZZ *pn = new ZZ();
+        power(*pn, p, pshift);
+        ZZ_pX_right_pshift(x, x, *pn, clower);
+        delete pn;
+        while (pshift > 0)
+        {
+            if (pshift & 1)
+            {
+                MulMod(x, x, high_shifter[i], modulus);
+            }
+            i++;
+            two_shift <<= 1;
+            pshift >>= 1;
+        }
+    }
+    i = 0;
+    two_shift = 1;
+    while (eis_part > 0)
+    {
+        //cout << "eis_part = " << eis_part << "\n";
+        if (eis_part & 1)
+        {
+            //cout << "i = " << i << "\n";
+            //cout << "two_shift = " << two_shift << "\n";
+            shifted_high_part = x >> two_shift;
+            //cout << "shifted_high_part = " << shifted_high_part << "\n";
+            low_part = x - (shifted_high_part << two_shift);
+            //cout << "low_part = " << low_part << "\n";
+            ZZ_pX_right_pshift(low_part, low_part, p, clower);
+            //cout << "low_part = " << low_part << "\n";
+            MulMod(low_part, low_part, low_shifter[i], modulus);
+            //cout << "low_part = " << low_part << "\n";
+            x = low_part + shifted_high_part;
+            //cout << "x = " << x << "\n";
+        }
+        i++;
+        two_shift <<= 1;
+        eis_part >>= 1;
+    }
+    //delete low_part;
+    //delete shifted_high_part;
 }
 
@@ -1384 +1648 @@
 }
 
-// Functions for using ZZ_pX's for p-adic extensions
-
-void ZZ_pX_conv_modulus(ZZ_pX &fout, const ZZ_pX &fin, const ZZ_pContext &modout)
-{ 
-    // Changes the modulus of fin to modout, and puts the result in fout.
-    long i, n;
-
-    n = fin.rep.length();
-    fout.rep.SetLength(n);
-
-    ZZ_p* xp = fout.rep.elts();
-    const ZZ_p* ap = fin.rep.elts();
-
-    // I think it's enough to just restore modout once.
-    // This should be true as long as the function rep taking a ZZ_p as an argument
-    // and returning a ZZ works when the ZZ_p::modulus is incorrect.
-    modout.restore();
-
-    for (i = 0; i < n; i++)
-    {
-        conv(xp[i], rep(ap[i]));
-    }
-    
-    // We may have set a leading coefficient to 0, so we have to normalize
-    fout.normalize();
-}
-
-void ZZ_pEX_conv_modulus(ZZ_pEX &fout, const ZZ_pEX &fin, const ZZ_pContext &modout)
-{
-    // Changes the modulus of fin to modout, and puts the result in fout.
-    long i, n, j, m;
-
-    n = fin.rep.length();
-    fout.rep.SetLength(n);
-
-    ZZ_pE* outpe = fout.rep.elts();
-    const ZZ_pE* inpe = fin.rep.elts();
-
-    ZZ_p* xp;
-    const ZZ_p* ap;
-    // I think it's enough to just restore modout once
-    // This should be true as long as Loophole() offers access to
-    // the underlying ZZ_pX representations of ZZ_pEs,
-    // and rep of a ZZ_p (giving a ZZ) works even if the ZZ_p::modulus is
-    // incorrect
-    modout.restore();
-
-    for (i = 0; i < n; i++)
-    {
-        m = rep(inpe[i]).rep.length();
-        outpe[i]._ZZ_pE__rep.rep.SetLength(m);
-
-        xp = outpe[i]._ZZ_pE__rep.rep.elts();
-        ap = rep(inpe[i]).rep.elts();
-
-        for (j = 0; j < m; j++)
-            conv(xp[j], rep(ap[j]));
-
-        // We may have set a leading coefficient to 0, so we have to normalize
-        outpe[i]._ZZ_pE__rep.normalize();
-    }
-    // We may have set a leading coefficient to 0, so we have to normalize
-    fout.normalize();
-}
-
-void ZZ_pX_min_val_coeff(long & valuation, long &index, const struct ZZ_pX &f, const struct ZZ &p)
-{
-    // Sets index, where the indexth coefficient of f has the minimum p-adic valuation.
-    // Sets valuation to be this valuation.
-    // If there are ties, index will be the lowest of the tied indices
-    // This only makes mathematical sense when p divides the modulus of f.
-    long i, n, v;
-
-    n = f.rep.length();
-    if (n == 0)
-    {
-        index = -1;
-        return;
-    }
-
-    const ZZ_p* fp = f.rep.elts();
-    ZZ *u = new ZZ();
-
-    valuation = -1;
-    i = 0;
-
-    while (valuation == -1)
-    {
-        if (rep(fp[i]) != 0)
-        {
-            index = i;
-            valuation = ZZ_remove(*u, rep(fp[i]), p);
-        }
-        i++;
-    }
-    for (; i < n; i++)
-    {
-        if (rep(fp[i]) != 0)
-        {
-            v = ZZ_remove(*u, rep(fp[i]), p);
-            if (v < valuation)
-            {
-                valuation = v;
-                index = i;
-            }
-        }
-    }
-    delete u;
-}
-
-long ZZ_pX_get_val_coeff(const struct ZZ_pX &f, const struct ZZ &p, long i)
-{
-    // Gets the p-adic valuation of the ith coefficient of f.
-    ZZ *u = new ZZ();
-    long ans = ZZ_remove(*u, rep(coeff(f, i)), p);
-    delete u;
-}
-
-void ZZ_pX_left_pshift(struct ZZ_pX &x, const struct ZZ_pX &a, const struct ZZ &pn, const struct ZZ_pContext &c)
-{
-    // Multiplies each coefficient by pn, and sets the context of the answer to c.
-
-    long i, n;
-
-    n = a.rep.length();
-    x.rep.SetLength(n);
-
-    ZZ_p* xp = x.rep.elts();
-    const ZZ_p* ap = a.rep.elts();
-
-    // I think it's enough to just restore modout once.
-    // This should be true as long as the function rep taking a ZZ_p as an argument
-    // and returning a ZZ works when the ZZ_p::modulus is incorrect.
-    c.restore();
-
-    for (i = 0; i < n; i++)
-    {
-        conv(xp[i], rep(ap[i]) * pn);
-    }
-    
-    // We may have set a leading coefficient to 0, so we have to normalize
-    x.normalize();    
-}
-
-void ZZ_pX_right_pshift(struct ZZ_pX &x, const struct ZZ_pX &a, const struct ZZ &pn, const struct ZZ_pContext &c)
-{
-    // Divides each coefficient by pn, and sets the context of the answer to c.
-
-    long i, n;
-
-    n = a.rep.length();
-    x.rep.SetLength(n);
-
-    ZZ_p* xp = x.rep.elts();
-    const ZZ_p* ap = a.rep.elts();
-
-    // I think it's enough to just restore modout once.
-    // This should be true as long as the function rep taking a ZZ_p as an argument
-    // and returning a ZZ works when the ZZ_p::modulus is incorrect.
-    c.restore();
-
-    for (i = 0; i < n; i++)
-    {
-        conv(xp[i], rep(ap[i]) / pn);
-    }
-    
-    // We may have set a leading coefficient to 0, so we have to normalize
-    x.normalize();    
-}
-
-void ZZ_pX_InvMod_newton(struct ZZ_pX &x, const struct ZZ_pX &a, const struct ZZ_pXModulus &F, const struct ZZ_pContext &cpn, const struct ZZ_pContext &cp)
-{
-    int j;
-    cp.restore();
-    ZZ_pX *amodp = new ZZ_pX();
-    ZZ_pX *xmodp = new ZZ_pX();
-    ZZ_pX *fmodp = new ZZ_pX();
-    ZZ_pX_conv_modulus(*amodp, a, cp);
-    ZZ_pX_conv_modulus(*fmodp, F.val(), cp);
-    InvMod(*xmodp, *amodp, *fmodp);
-    //cout << "xmodp: " << *xmodp << "\namodp: " << *amodp << "\nfmodp: " << *fmodp << "\n";
-    cpn.restore();
-    ZZ_pX *minusa = new ZZ_pX();
-    ZZ_pX *xn = new ZZ_pX();
-    ZZ_pX_conv_modulus(*xn, *xmodp, cpn);
-    negate(*minusa, a);
-    do
-    {
-        *xn = x;
-        // x_n = 2*x_{n-1} - a*x_{n-1}^2 = (2 - a*x_{n-1})*x_{n-1}
-        MulMod(x, *minusa, *xn, F);
-        SetCoeff(x, 0, ConstTerm(x) + 2);
-        MulMod(x, x, *xn, F);
-        //cout << "x: " << x << "\nxn: " << *xn << "\n";
-        //cin >> j;
-    } while (x != (*xn));
-    delete amodp;
-    delete xmodp;
-    delete fmodp;
-    delete minusa;
-    delete xn;
-}
-
-void ZZ_pX_eis_shift(struct ZZ_pX &x, const struct ZZ_pX &a, long n, const struct ZZ_pXMultiplier* low_shifter, const struct ZZ_pXMultiplier* high_shifter, const struct ZZ_pXModulus &modulus, const struct ZZ &p, const struct ZZ_pContext &cupper, const struct ZZ_pContext &clower)
-{
-    long degree = deg(modulus);
-    long pshift = n / degree;
-    long eis_part = n % degree;
-    long two_shift = 1;
-    int i;
-
-    cupper.restore();
-    //cout << "eis_part: " << eis_part << "\n";
-    //cout << "pshift: " << pshift << "\n";
-    ZZ_pX low_part; // = new ZZ_pX();
-    ZZ_pX shifted_high_part; // = new ZZ_pX();
-    x = a;
-    //cout << "beginning: a = " << a << "\n";
-    if (pshift)
-    {
-        i = 0;
-        two_shift = 1;
-        ZZ *pn = new ZZ();
-        power(*pn, p, pshift);
-        ZZ_pX_right_pshift(x, x, *pn, clower);
-        delete pn;
-        while (pshift > 0)
-        {
-            if (pshift & 1)
-            {
-                MulMod(x, x, high_shifter[i], modulus);
-            }
-            i++;
-            two_shift <<= 1;
-            pshift >>= 1;
-        }
-    }
-    i = 0;
-    two_shift = 1;
-    while (eis_part > 0)
-    {
-        //cout << "eis_part = " << eis_part << "\n";
-        if (eis_part & 1)
-        {
-            //cout << "i = " << i << "\n";
-            //cout << "two_shift = " << two_shift << "\n";
-            shifted_high_part = x >> two_shift;
-            //cout << "shifted_high_part = " << shifted_high_part << "\n";
-            low_part = x - (shifted_high_part << two_shift);
-            //cout << "low_part = " << low_part << "\n";
-            ZZ_pX_right_pshift(low_part, low_part, p, cupper);
-            //cout << "low_part = " << low_part << "\n";
-            MulMod(low_part, low_part, low_shifter[i], modulus);
-            //cout << "low_part = " << low_part << "\n";
-            x = low_part + shifted_high_part;
-            //cout << "x = " << x << "\n";
-        }
-        i++;
-        two_shift <<= 1;
-        eis_part >>= 1;
-    }
-    //delete low_part;
-    //delete shifted_high_part;
-}
-
 ZZ_pEContext* ZZ_pEContext_new(ZZ_pX *f)
 {

sage/libs/ntl/decl.pxi

@@ -149 +149 @@
     void ZZ_p_mul "mul"( ZZ_p_c x, ZZ_p_c a, ZZ_p_c b)
     void ZZ_p_mul_long "mul"( ZZ_p_c x, ZZ_p_c a, long b)
+    void ZZ_p_div "div"( ZZ_p_c x, ZZ_p_c a, ZZ_p_c b)
     void ZZ_p_negate "negate"(ZZ_p_c x, ZZ_p_c a)
     void ZZ_p_power "power"(ZZ_p_c t, ZZ_p_c x, long e)
@@ -424 +425 @@
     void ZZ_pX_right_pshift(ZZ_pX_c x, ZZ_pX_c a, ZZ_c pn, ZZ_pContext_c c)
     void ZZ_pX_InvMod_newton(ZZ_pX_c x, ZZ_pX_c a, ZZ_pX_Modulus_c F, ZZ_pContext_c cpn, ZZ_pContext_c cp)
-    void ZZ_pX_eis_shift(ZZ_pX_c x, ZZ_pX_c a, long n, ZZ_pX_Multiplier_c* low_shifter, ZZ_pX_Multiplier_c* high_shifter, ZZ_pX_Modulus_c modulus, ZZ_c p, ZZ_pContext_c cupper, ZZ_pContext_c clower)   
+    void ZZ_pX_eis_shift(ZZ_pX_c x, ZZ_pX_c a, long n, ZZ_pX_Multiplier_c* low_shifter, ZZ_pX_Multiplier_c* high_shifter, ZZ_pX_Modulus_c modulus, ZZ_c p, ZZ_pContext_c clower)   
 
     # The following are ZZ_pX functions written in ntl_wrap, used for padics.
@@ -823 +824 @@
     GF2EContext_c* GF2EContext_construct "Construct<GF2EContext>"(void *mem)
     GF2EContext_c* GF2EContext_new_GF2X "GF2EContext_new"(GF2X_c* p)
-    GF2EContext_c* GF2EContext_construct_GF2X "GF2EContext_construct"(void *mem, GF2X_c* p)
+    GF2EContext_c* GF2EContext_construct_GF2X "Construct<GF2EContext>"(void *mem, GF2X_c* p)
     void GF2EContext_destruct "Destruct<GF2EContext>"(GF2EContext_c *mem)
     void GF2EContext_delete "Delete<GF2EContext>"(GF2EContext_c *mem)

sage/rings/padics/eisenstein_fixed_mod_element.pyx

@@ -76 +76 @@
                             self.prime_pow.get_top_modulus()[0], \
                             self.prime_pow.small_powers[1], \
-                            self.prime_pow.get_top_context().x, \
                             self.prime_pow.get_top_context().x)
             if top_zeros:

sage/rings/padics/padic_ZZ_pX_CR_element.pyx

@@ -9 +9 @@
 from sage.libs.ntl.ntl_ZZ_pContext cimport ntl_ZZ_pContext_class
 from sage.libs.ntl.ntl_ZZ_pContext import ntl_ZZ_pContext
+
+from sage.rings.padics.pow_computer_ext cimport PowComputer_ZZ_pX
+from sage.rings.padics.pow_computer_ext cimport PowComputer_ZZ_pX_small_Eis
+from sage.rings.padics.pow_computer_ext cimport PowComputer_ZZ_pX_big_Eis
 
 cdef object infinity
@@ -82 +86 @@
             self._set_from_ZZ_pX_c(poly.x, poly.c)
 
-    cdef int _set_from_mpz_rel(self, mpz_t x, unsigned long relprec) except -1:
-        self.prime_pow.restore_top_context()
-        cdef ZZ_c tmp
-        ZZ_construct(&tmp)
-        mpz_to_ZZ(&tmp, &x)
-        ZZ_pX_SetCoeff(self.value, 0, ZZ_to_ZZ_p(tmp))
-        ZZ_destruct(&tmp)
-
-    cdef int _set_from_mpz_both(self, mpz_t x, long absprec, unsigned long relprec) except -1:
+    cdef int _set_inexact_zero(self, long absprec) except -1:
+        # self.unit should already have been set to zero
+        self.ordp = absprec
+        self.relprec = 0
+        self._normalized = 1
+
+    cdef int _set_exact_zero(self) except -1:
+        cdef long maxlong
+        if sizeof(long) == 4:
+            maxlong = 2147483647
+        elif sizeof(long) == 8:
+            maxlong = 9223372036854775807
+        else:
+            raise RuntimeError
+        self.ordp = maxlong
+        self._normalized = 1
+
+    cdef bint _is_exact_zero(self) except -2:
+        cdef long maxlong
+        if sizeof(long) == 4:
+            maxlong = 2147483647
+        elif sizeof(long) == 8:
+            maxlong = 9223372036854775807
+        else:
+            raise RuntimeError
+        if self.ordp == maxlong:
+            return 1
+        else:
+            return 0
         
-
-    cdef int _set_from_ZZ_pX_c(self, ZZ_pX_c poly) except -1:
-        self.prime_pow.restore_top_context()
-        ZZ_pX_conv_modulus(self.value, poly, (<ntl_ZZ_pContext_class>self.prime_pow.get_top_context()).x)
+    cdef int _set_from_ZZX_rel(self, ZZX_c poly, unsigned long relprec) except -1:
+        """
+        self.prime_pow must already be set.
+        relprec should be in range 0 <= relprec <= self.prime_pow.ram_prec_cap
+        """
+        if ZZX_IsZero(poly):
+            self._set_exact_zero()
+            return
+        cdef long i = 0
+        cdef long deg = ZZX_deg(poly)
+        cdef long mini = -1
+        cdef long minval
+        cdef long curval
+        cdef ZZ_c tmp_z
+        cdef ZZ_c *ppow
+        cdef ZZ_pX tmp_p
+        ZZ_construct(&tmp_z)
+        while mini == -1:
+            if not ZZ_IsZero(ZZX_coeff(poly,i)):
+                minval = ZZ_remove(tmp_z, ZZX_coeff(poly, i), self.prime_pow.pow_ZZ_tmp(1)[0])
+                mini = i
+            i += 1
+        while i <= deg:
+            if not ZZ_IsZero(ZZX_coeff(poly,i)):
+                curval = ZZ_remove(tmp_z, ZZX_coeff(poly, i), self.prime_pow.pow_ZZ_tmp(1)[0])
+                if curval < minval:
+                    minval = curval
+                    mini = i
+            i += 1
+            
+        self.relprec = relprec
+        if self.prime_pow.e == 1: # unramified
+            self.prime_pow.restore_context(relprec)
+            self.ordp = minval
+            ppow = self.prime_pow.pow_ZZ_tmp(minval)
+            for i from 0 <= i <= deg:
+                ZZ_div(tmp_z, ZZX_coeff(poly, i), ppow[0])
+                ZZ_pX_SetCoeff(self.unit, i, ZZ_to_ZZ_p(tmp_z))
+        else: # eisenstein
+            self.ordp = minval * self.prime_pow.e + mini
+            self.prime_pow.restore_context(minval + cap_div(relprec + mini, self.prime_pow.e))
+            ZZ_pX_construct(&tmp_p)
+            ZZX_to_ZZ_pX(tmp_p, poly)
+            if PY_TYPE_CHECK(self.prime_pow, PowComputer_ZZ_pX_small_Eis):
+                ZZ_pX_eis_shift(self.unit, tmp_p, self.ordp, (<PowComputer_ZZ_pX_small_Eis>self.prime_pow).low_shifter, \
+                                (<PowComputer_ZZ_pX_small_Eis>self.prime_pow).high_shifter, \
+                                self.prime_pow.get_modulus(cap_div(relprec, self.prime_pow.e)), \
+                                self.prime_pow.pow_ZZ_tmp(1)[0], \
+                                self.prime_pow.get_context(cap_div(relprec, self.prime_pow.e)))
+            elif PY_TYPE_CHECK(self.prime_pow, PowComputer_ZZ_pX_big_Eis):
+                ZZ_pX_eis_shift(self.unit, tmp_p, self.ordp, (<PowComputer_ZZ_pX_big_Eis>self.prime_pow).low_shifter, \
+                                (<PowComputer_ZZ_pX_big_Eis>self.prime_pow).high_shifter, \
+                                self.prime_pow.get_modulus(cap_div(relprec, self.prime_pow.e)), \
+                                self.prime_pow.pow_ZZ_tmp(1)[0], \
+                                self.prime_pow.get_context(cap_div(relprec, self.prime_pow.e)))
+            else:
+                raise RuntimeError, "prime_pow is of inconsistent type"
+            ZZ_pX_destruct(&tmp_p)
+        ZZ_destruct(&tmp_z)
+        self._normalized = 1
+
+
+    cdef int _set_from_ZZ_pX_both(self, ZZ_pX_c poly, long absprec, unsigned long relprec) except -1:
+        """
+        self.prime_pow must already be set.
+        relprec should be in range 0 <= relprec <= self.prime_pow.ram_prec_cap
+        """
+        if ZZ_pX_IsZero(poly):
+            self._set_inexact_zero(absprec)
+            return
+        cdef long i = 0
+        cdef long deg = ZZ_pX_deg(poly)
+        cdef long mini = -1
+        cdef long minval
+        cdef long curval
+        cdef ZZ_c tmp_z
+        cdef ZZ_c *ppow
+        cdef ZZ_pX tmp_p
+        ZZ_construct(&tmp_z)
+        while mini == -1:
+            if not ZZ_p_IsZero(ZZ_pX_coeff(poly,i)):
+                minval = ZZ_remove(tmp_z, ZZ_p_rep(ZZ_pX_coeff(poly, i)), self.prime_pow.pow_ZZ_tmp(1)[0])
+                mini = i
+            i += 1
+        while i <= deg:
+            if not ZZ_p_IsZero(ZZ_pX_coeff(poly,i)):
+                curval = ZZ_remove(tmp_z, ZZ_p_rep(ZZ_pX_coeff(poly, i)), self.prime_pow.pow_ZZ_tmp(1)[0])
+                if curval < minval:
+                    minval = curval
+                    mini = i
+            i += 1
+        if self.prime_pow.e == 1: # unramified
+            self.ordp = minval
+            self.relprec = absprec - self.ordp
+            if relprec < self.relprec:
+                self.relprec = relprec
+            elif self.relprec < 0:
+                self.set_inexact_zero(absprec)
+                return
+            self.prime_pow.restore_context(relprec)
+            ppow = self.prime_pow.pow_ZZ_tmp(minval)
+            for i from 0 <= i <= deg:
+                ZZ_div(tmp_z, ZZ_p_rep(ZZ_pX_coeff(poly, i)), ppow[0])
+                ZZ_pX_SetCoeff(self.unit, i, ZZ_to_ZZ_p(tmp_z))
+        else: # eisenstein
+            self.ordp = minval * self.prime_pow.e + mini
+            self.relprec = absprec - self.ordp
+            if relprec < self.relprec:
+                self.relprec = relprec
+            elif self.relprec < 0:
+                self.set_inexact_zero(absprec)
+                return
+            self.prime_pow.restore_context(minval + cap_div(relprec + mini, self.prime_pow.e))
+            if PY_TYPE_CHECK(self.prime_pow, PowComputer_ZZ_pX_small_Eis):
+                ZZ_pX_eis_shift(self.unit, poly, self.ordp, (<PowComputer_ZZ_pX_small_Eis>self.prime_pow).low_shifter, \
+                                (<PowComputer_ZZ_pX_small_Eis>self.prime_pow).high_shifter, \
+                                self.prime_pow.get_modulus(cap_div(relprec, self.prime_pow.e)), \
+                                self.prime_pow.pow_ZZ_tmp(1)[0], \
+                                self.prime_pow.get_context(cap_div(relprec, self.prime_pow.e)))
+            elif PY_TYPE_CHECK(self.prime_pow, PowComputer_ZZ_pX_big_Eis):
+                ZZ_pX_eis_shift(self.unit, poly, self.ordp, (<PowComputer_ZZ_pX_big_Eis>self.prime_pow).low_shifter, \
+                                (<PowComputer_ZZ_pX_big_Eis>self.prime_pow).high_shifter, \
+                                self.prime_pow.get_modulus(cap_div(relprec, self.prime_pow.e)), \
+                                self.prime_pow.pow_ZZ_tmp(1)[0], \
+                                self.prime_pow.get_context(cap_div(relprec, self.prime_pow.e)))
+            else:
+                raise RuntimeError, "prime_pow is of inconsistent type"
+        ZZ_destruct(&tmp_z)
+        self._normalized = 1
+
+    cdef _normalize(self):
 
     def __dealloc__(self):

sage/rings/padics/padic_capped_relative_element.pyx

@@ -425 +425 @@
             mpz_invert(self.unit, den_unit, self.prime_pow.pow_mpz_t_tmp(self.relprec)[0])
             mpz_mul(self.unit, self.unit, num_unit)
-            mpz_mod(self.unit, self.unit, self.prime_pow.pow_mpz_t_tmp(relprec)[0])
+            mpz_mod(self.unit, self.unit, self.prime_pow.pow_mpz_t_tmp(self.relprec)[0])
         mpz_clear(num_unit)
         mpz_clear(den_unit)
@@ -534 +534 @@
                 self.ordp = self.ordp + self.relprec
                 self.relprec = 0
-        self._normalized = 1
+            self._normalized = 1
 
     def __dealloc__(pAdicCappedRelativeElement self):
@@ -1564 +1564 @@
         elif sizeof(long) == 8:
             maxlong = 9223372036854775807
+        else:
+            raise RuntimeError
         if v == maxlong:
             return infinity
@@ -1573 +1575 @@
         cdef Integer ans
         cdef long maxlong
+        self._normalize()
         if mpz_sgn(self.unit) == -1:
             if sizeof(long) == 4:
@@ -1578 +1581 @@
             elif sizeof(long) == 8:
                 maxlong = 9223372036854775807
+            else:
+                raise RuntimeError
             return maxlong
         else:

setup.py

@@ -207 +207 @@
                  libraries = ["csage", "ntl", "gmp", "gmpxx", "m", "stdc++"],
                  language='c++')
+
+ntl_GF2EContext = Extension('sage.libs.ntl.ntl_GF2EContext',
+                 sources = ["sage/libs/ntl/ntl_GF2EContext.pyx"],
+                 libraries = ["csage", "ntl", "gmp", "gmpxx", "m", "stdc++"],
+                 language = "c++")
 
 mwrank =  Extension("sage.libs.mwrank.mwrank",