Changeset 8369:238a1cb9aba0

Timestamp:

11/07/07 18:15:24 (6 years ago)

Author:

jvoight@…

Branch:

default

Message:

Fixes to totallyreal, especially in LM.

Location:

sage/rings/number_field

Files:

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

sage/rings/number_field/totallyreal.py

@@ -193 +193 @@
     # Trivial case
     if n == 1:
-        if print_return_seqs:
-            return [1,[1,-1]]
+        if return_seqs:
+            return [[0,0,0,0],[[1,[-1,1]]]]
         else:
-            return [1,pari('x-1')]
+            return [[1,pari('x-1')]]
 
     if verbose:

sage/rings/number_field/totallyreal_data.pyx

@@ -449 +449 @@
 
             # Bounds come from an application of Lagrange multipliers in degrees 2,3.
-            self.b_lower = 1./n*(-self.a[n-1] - 
-                             (n-1)*sqrt((1.*self.a[n-1])**2 - 2.*(1-1./n)*self.a[n-2]))
-            self.b_upper = -(2.*self.a[n-1]/n + self.b_lower)
+            self.b_lower = -1./n*(self.a[n-1] + (n-1.)*sqrt((1.*self.a[n-1])**2 - 2.*(1+1./(n-1))*self.a[n-2]))
+            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])
@@ -603 +602 @@
                         break
 
+                    # Knowing a[n-1] and a[n-2] means we can apply bounds from
+                    # the Lagrange multiplier in degree 2, which can be solved
+                    # immediately.
+                    self.b_lower = -1./n*(self.a[n-1] + (n-1.)*sqrt((1.*self.a[n-1])**2 - 2.*(1+1./(n-1))*self.a[n-2]))
+                    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]))
+
                     # Initialize the second derivative.
-                    self.b_lower = 1./n*(-self.a[n-1] - 
-                                     (n-1)*sqrt((1.*self.a[n-1])**2 - 2.*(1+1./(n-1))*self.a[n-2]))
-                    self.b_upper = -(2.*self.a[n-1]/n + self.b_lower)
                     self.beta[k*np1+0] = self.b_lower
                     self.beta[k*np1+1] = -self.a[n-1]*1./n
@@ -644 +646 @@
                         break
                     
-                    if k == n-3 and n > 3:
-                        # Knowing a[n-1] and a[n-2] means we can apply bounds from
-                        # the Lagrange multiplier in degree 2, which can be solved
-                        # immediately.
-                        self.b_lower = 1./n*(-self.a[n-1] - 
-                                         (n-1)*sqrt((1.*self.a[n-1])**2 - 2.*(1-1./n)*self.a[n-2]))
-                        self.b_upper = -(2.*self.a[n-1]/n + self.b_lower)
+                    # Bounds come from an application of Lagrange multipliers in degrees 2,3.
+                    if k == n-3:
+                        self.b_lower = -1./n*(self.a[n-1] + (n-1.)*sqrt((1.*self.a[n-1])**2 - 2.*(1+1./(n-1))*self.a[n-2]))
+                        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]))
                     elif k == n-4:
                         # New bounds from Lagrange multiplier in degree 3.

sage/rings/number_field/totallyreal_dsage.py

@@ -218 +218 @@
         # For each completed job, add the fields to the list.
         while i < len(self.jobs):
-            self.jobs[i].get_job()
-            if type(self.jobs[i][1]) <> str and self.jobs[i][1].status == 'completed' and self.jobs[i][1].result <> 'None':
-                job = self.jobs.pop(i)
-
-                # Add the timings.
-                self.cputime += job[1].cpu_time
-                self.walltime += job[1].wall_time
-
-                if write_result:
-                    fsock = open(filename_start + str(job[0]).replace(' ','') + '.out', 'w')
-                    fsock.write("Cpu time = " + timestr(job[1].cpu_time) + "\n")
-                    fsock.write("Wall time = " + timestr(job[1].wall_time) + "\n")
-
-                # Output from dsage comes as a string, so convert.
-                S = job[1].result
-                # Add the counts of polynomials checked.
-                for j in range(4):
-                    self.counts[j] += S[0][j]
-                if write_result:
-                    fsock.write("Counts: " + str(S[0]) + "\n")
-                    fsock.write("Total number of fields: " + str(len(S[1])) + "\n\n")
-
-                # Convert the sequences to pari objects, and compile.
-                S = S[1]
-                for j in range(len(S)):
-                    S[j][1] = pari(str(S[j][1])).Polrev()
-                self.S += S
-                if write_result:
+            if type(self.jobs[i][1]) <> str:
+                self.jobs[i][1].get_job()
+                if self.jobs[i][1].status == 'completed' and self.jobs[i][1].result <> 'None':
+                    job = self.jobs.pop(i)
+
+                    # Add the timings.
+                    self.cputime += job[1].cpu_time
+                    self.walltime += job[1].wall_time
+
+                    if write_result:
+                        fsock = open(filename_start + str(job[0]).replace(' ','') + '.out', 'w')
+                        fsock.write("Cpu time = " + timestr(job[1].cpu_time) + "\n")
+                        fsock.write("Wall time = " + timestr(job[1].wall_time) + "\n")
+
+                    # Output from dsage comes as a string, so convert.
+                    S = job[1].result
+                    # Add the counts of polynomials checked.
+                    for j in range(4):
+                        self.counts[j] += S[0][j]
+                    if write_result:
+                        fsock.write("Counts: " + str(S[0]) + "\n")
+                        fsock.write("Total number of fields: " + str(len(S[1])) + "\n\n")
+
+                    # Convert the sequences to pari objects, and compile.
+                    S = S[1]
                     for j in range(len(S)):
-                        fsock.write(str(S[j]) + "\n")
-
-                fsock.close()
-
-            # Otherwise, continue.  
-            # Note we do not add 1 to i if we just popped jobs!
+                        S[j][1] = pari(str(S[j][1])).Polrev()
+                    self.S += S
+                    if write_result:
+                        for j in range(len(S)):
+                            fsock.write(str(S[j]) + "\n")
+
+                    fsock.close()
+
+                # Otherwise, continue.  
+                # Note we do not add 1 to i if we just popped jobs!
+                else:
+                    i += 1
             else:
                 i += 1