Changeset 7685:fde68d8392d8

Timestamp:

11/21/07 11:40:07 (6 years ago)

Author:

Robert Bradshaw <robertwb@…>

Branch:

default

Message:

change doctests to match new gp scripts

Location:

sage/schemes/elliptic_curves

Files:

• ell_generic.py (modified) (1 diff)
• ell_number_field.py (modified) (2 diffs)
• ell_rational_field.py (modified) (1 diff)
• gp_simon.py (modified) (1 diff)

sage/schemes/elliptic_curves/ell_generic.py

@@ -1386 +1386 @@
         denom = lcm([a.denominator() for a in self.ainvs()])
         if denom != 1:
-            raise NotImplementedError, "model must be integral for now"
+            F = self.integral_weierstrass_model()
+            return F, self.isomorphism_to(F)
         else:
             parent = self(0).parent()

sage/schemes/elliptic_curves/ell_number_field.py

@@ -105 +105 @@
             sage: E = EllipticCurve(K, '37')
             sage: E.simon_two_descent()
-            (2, 2, [(-4 : -4 : 1), (2*a - 10 : -4*a - 48 : 1)])
+            (2, 2, [(-1 : 0 : 1), (1/2*a - 5/2 : -1/2*a - 13/2 : 1)])
             
             sage: K.<a> = NumberField(x^2 + 7, 'a')
@@ -111 +111 @@
             Elliptic Curve defined by y^2  = x^3 + x + a over Number Field in a with defining polynomial x^2 + 7
             sage: v = E.simon_two_descent(verbose=1); v
-            courbe elliptique : Y^2 = x^3 + Mod(3*y, y^2 + 7)*x^2 + Mod(-20, y^2 + 7)*x + Mod(-5*y, y^2 + 7)
-            points triviaux sur la courbe = [[1, 1, 0], [Mod(-1/2*y + 3/2, y^2 + 7), Mod(-y - 2, y^2 + 7), 1]]
+            courbe elliptique : Y^2 = x^3 + Mod(1, y^2 + 7)*x + Mod(y, y^2 + 7)
+            A = 0
+            B = Mod(1, y^2 + 7)
+            C = Mod(y, y^2 + 7)
+            LS2gen = [Mod(Mod(-5, y^2 + 7)*x^2 + Mod(-3*y, y^2 + 7)*x + Mod(8, y^2 + 7), x^3 + Mod(1, y^2 + 7)*x + Mod(y, y^2 + 7)), Mod(Mod(1, y^2 + 7)*x^2 + Mod(1/2*y + 1/2, y^2 + 7)*x - 1, x^3 + Mod(1, y^2 + 7)*x + Mod(y, y^2 + 7))]
+            #LS2gen = 2
+             Recherche de points triviaux sur la courbe 
+            points triviaux sur la courbe = [[1, 1, 0], [Mod(1/2*y + 3/2, y^2 + 7), Mod(-y - 2, y^2 + 7), 1]]
+            zc = Mod(Mod(-5, y^2 + 7)*x^2 + Mod(-3*y, y^2 + 7)*x + Mod(8, y^2 + 7), x^3 + Mod(1, y^2 + 7)*x + Mod(y, y^2 + 7))
+             symbole de Hilbert (Mod(2, y^2 + 7),Mod(-5, y^2 + 7)) = -1
+            zc = Mod(Mod(1, y^2 + 7)*x^2 + Mod(1/2*y + 1/2, y^2 + 7)*x + Mod(-1, y^2 + 7), x^3 + Mod(1, y^2 + 7)*x + Mod(y, y^2 + 7))
+             vient du point trivial [Mod(1/2*y + 3/2, y^2 + 7), Mod(-y - 2, y^2 + 7), 1]
+            m1 = 1
+            m2 = 1
             #S(E/K)[2]    = 2
             #E(K)/2E(K)   = 2
             #III(E/K)[2]  = 1
             rang(E/K)     = 1
-            listpointsmwr = [[Mod(-1/2*y + 3/2, y^2 + 7), Mod(-y - 2, y^2 + 7), 1]]
+            listpointsmwr = [[Mod(1/2*y + 3/2, y^2 + 7), Mod(-y - 2, y^2 + 7), 1]]
             (1, 1, [(1/2*a + 3/2 : -a - 2 : 1)])
-            
+
         A curve with 2-torsion
             sage: K.<a> = NumberField(x^2 + 7, 'a')

sage/schemes/elliptic_curves/ell_rational_field.py

@@ -819 +819 @@
             sage: E = EllipticCurve('37a1')
             sage: E.simon_two_descent()
-            (1, 1, [(0 : 4 : 1)])
+            (1, 1, [(0 : 0 : 1)])
             sage: E = EllipticCurve('389a1')
             sage: E.simon_two_descent()
-            (2, 2, [(57/4 : 621/8 : 1), (57 : 243 : 1)])
+            (2, 2, [(1 : 0 : 1), (-11/9 : -55/27 : 1)])
             sage: E = EllipticCurve('5077a1')
             sage: E.simon_two_descent()
-            (3, 3, [(1 : 17 : 1), (-8 : 28 : 1), (8 : 4 : 1)])
+            (3, 3, [(1 : 0 : 1), (2 : -1 : 1), (0 : 2 : 1)])
 
 

sage/schemes/elliptic_curves/gp_simon.py

@@ -65 +65 @@
         print cmd
     s = gp.eval('ans=%s;'%cmd)
-    if s.find("***") != -1:
+    if s.find("###") != -1:
         raise RuntimeError, "%s\nAn error occured while running Simon's 2-descent program"%s
     if verbose > 0: