Changeset 8371:1bdb1c81793f

Timestamp:

11/08/07 09:01:35 (6 years ago)

Author:

jvoight@…

Branch:

default

Message:

Merge.

Location:

sage/rings/number_field

Files:

• totallyreal.py (modified) (1 diff)
• totallyreal_data.pyx (modified) (4 diffs)

sage/rings/number_field/totallyreal.py

@@ -323 +323 @@
                    S.pop(j)
                else:
-                   S.pop(i)
+                   s = S.pop(i)
+                   S.insert(i, S.pop(j))
            else:
                j += 1
-       i = j
+       i += 1
 
 def timestr(m):

sage/rings/number_field/totallyreal_data.pyx

@@ -175 +175 @@
         rts[i] = newton(f, df, n, (beta[i]+beta[i+1])/2, eps)
 
-def __lagrange_degree_3(n, an1, an2, an3):
+def lagrange_degree_3(n, an1, an2, an3):
     r"""
     Private function.  Solves the equations which arise in the Lagrange multiplier
@@ -185 +185 @@
 
     EXAMPLES:
-        sage: sage.rings.number_field.totallyreal_data.__lagrange_degree_3(3, 0, 1, 2)
+        sage: sage.rings.number_field.totallyreal_data.lagrange_degree_3(3, 0, 1, 2)
         [-1.000000019137512, -0.99999998086248831]
-        sage: sage.rings.number_field.totallyreal_data.__lagrange_degree_3(3, 6, 1, 2)
+        sage: sage.rings.number_field.totallyreal_data.lagrange_degree_3(3, 6, 1, 2)
         [-5.8878509412236602, -5.887850753893237]
     """
@@ -452 +452 @@
             self.b_upper = -1./n*(self.a[n-1] - (n-1.)*sqrt((1.*self.a[n-1])**2 - 2.*(1+1./(n-1))*self.a[n-2]))
             if k < n-2:
-                bminmax = __lagrange_degree_3(n,a[n-1],a[n-2],a[n-3])
+                bminmax = lagrange_degree_3(n,a[n-1],a[n-2],a[n-3])
                 self.b_lower = bminmax[0]
                 self.b_upper = bminmax[1]
@@ -652 +652 @@
                     elif k == n-4:
                         # New bounds from Lagrange multiplier in degree 3.
-                        bminmax = __lagrange_degree_3(n,self.a[n-1],self.a[n-2],self.a[n-3])
+                        bminmax = lagrange_degree_3(n,self.a[n-1],self.a[n-2],self.a[n-3])
                         self.b_lower = bminmax[0]
                         self.b_upper = bminmax[1]