Changeset 8375:76868822c7ef

Timestamp:

11/09/07 14:24:20 (6 years ago)

Author:

jvoight@…

Branch:

default

Message:

Added keep_fields to totallyreal and relative enumeration.

Location:

sage/rings/number_field

Files:

• totallyreal.py (modified) (4 diffs)
• totallyreal_rel.py (added)

sage/rings/number_field/totallyreal.py

@@ -85 +85 @@
     return dB
 
-def enumerate_totallyreal_fields(n, B, a = [], verbose=0, return_seqs=False, phc=False):
+def enumerate_totallyreal_fields(n, B, a = [], verbose=0, return_seqs=False, phc=False, keep_fields=False):
     r"""
     This function enumerates (primitive) totally real fields of 
@@ -97 +97 @@
     If return_seqs, then return the polynomials as sequences (for easier
     exporting to a file).
+    If keep_fields, then keep fields up to B*log(B); if keep_fields is 
+    an integer, then keep fields up to that integer.
 
     NOTE: 
@@ -191 +193 @@
     counts = [0,0,0,0]
 
+    if keep_fields:
+        if type(keep_fields) == bool:
+            keepB = int(math.floor(B*math.log(B)))
+        else:
+            keepB = keep_fields
+
     # Trivial case
     if n == 1:
@@ -225 +233 @@
                     [zk,d] = nf.nfbasis_d()
 
-                    if d <= B:
+                    if d <= B or (keep_fields and d <= keepB):
                         if verbose:
                             print "has discriminant", d,