Merge pull request #6841 from LMFDB/copilot/fix-signature-display-number-fields

Change number field signature display from [r1, r2] to (r1, r2)

Author: jwj61

lmfdb/number_fields/number_field.py

@@ -326,7 +326,7 @@ def statistics():
                  for r2 in range(12)]
     nsig = [[{'cnt': comma(nsig[nn][r2]),
              'prop': format_percentage(nsig[nn][r2], n[nn]),
-             'query': url_for(".number_field_render_webpage")+'?degree=%d&signature=[%d,%d]' % (nn+1,nn+1-2*r2,r2)} for r2 in range(len(nsig[nn]))] for nn in range(len(nsig))]
+             'query': url_for(".number_field_render_webpage")+'?degree=%d&signature=(%d,%d)' % (nn+1,nn+1-2*r2,r2)} for r2 in range(len(nsig[nn]))] for nn in range(len(nsig))]
     h = [{'cnt': comma(h[j]),
           'prop': format_percentage(h[j], has_h),
           'label': '$10^{' + str(j - 1) + r'}<h\leq 10^{' + str(j) + '}$',
@@ -342,7 +342,7 @@ def statistics():
     sigclass1 = [[{'cnt': comma(sigclass1.get((nn+1,r2),0)),
                    'prop': format_percentage(sigclass1.get((nn+1,r2),0), sighasclass.get((nn+1,r2),0)) if sighasclass.get((nn+1,r2),0) > 0 else 0,
                    'show': sighasclass.get((nn+1,r2),0) > 0,
-                   'query': url_for(".number_field_render_webpage")+'?degree=%d&signature=[%d,%d]&class_number=1' % (nn + 1, nn + 1 - 2*r2, r2)}
+                   'query': url_for(".number_field_render_webpage")+'?degree=%d&signature=(%d,%d)&class_number=1' % (nn + 1, nn + 1 - 2*r2, r2)}
                   for r2 in range(len(nsig[nn]))] for nn in range(len(nsig))]
 
     n = [{'cnt': comma(n[nn]),
@@ -373,8 +373,8 @@ def statistics():
 @nf_page.route("/")
 def number_field_render_webpage():
     info = to_dict(request.args, search_array=NFSearchArray())
-    sig_list = sum([[[d - 2 * r2, r2] for r2 in range(
-        1 + (d // 2))] for d in range(1, 11)], []) + sum([[[d, 0]] for d in range(11, 21)], [])
+    sig_list = sum([[(d - 2 * r2, r2) for r2 in range(
+        1 + (d // 2))] for d in range(1, 11)], []) + sum([[(d, 0)] for d in range(11, 21)], [])
     sig_list = [str(s).replace(' ','') for s in sig_list[:16]]
     if not request.args:
         init_nf_count()
@@ -465,7 +465,7 @@ def render_field_webpage(args):
     data['class_group'] = nf.class_group()
     data['narrow_class_group'] = nf.narrow_class_group()
     data['class_group_invs'] = nf.class_group_invariants()
-    data['signature'] = nf.signature()
+    data['signature'] = nf.signature_display()
     data['coefficients'] = nf.coeffs()
     nf.make_code_snippets()
     D = nf.disc()
@@ -850,7 +850,7 @@ def number_field_jump(info):
                  lambda label: '<a href="%s">%s</a>' % (url_for_label(label), nf_label_pretty(label))),
     PolynomialCol("coeffs", "nf.defining_polynomial", "Polynomial"),
     MathCol("degree", "nf.degree", "Degree", align="center", default=False),
-    MultiProcessedCol("signature", "nf.signature", "Signature", ["r2", "degree"], lambda r2, degree: '[%s,%s]' % (degree - 2*r2, r2 ), apply_download=lambda r2, degree: [degree - 2*r2, r2], align="center", default=False),
+    MultiProcessedCol("signature", "nf.signature", "Signature", ["r2", "degree"], lambda r2, degree: '(%s, %s)' % (degree - 2*r2, r2 ), apply_download=lambda r2, degree: [degree - 2*r2, r2], align="center", default=False),
     DiscriminantCol("disc", "nf.discriminant", "Discriminant", ['disc_sign', 'disc_abs'], func=None, align="left"),
     MathCol("num_ram", "nf.ramified_primes", "Ram. prime count", short_title="ramified prime count", default=False),
     MathCol("rd", "nf.root_discriminant", "Root discriminant", default=False),
@@ -1185,7 +1185,7 @@ def __init__(self):
             name="signature",
             label="Signature",
             knowl="nf.signature",
-            example="[1,1]")
+            example="(1,1)")
         discriminant = TextBox(
             name="discriminant",
             label="Discriminant",

lmfdb/number_fields/test_numberfield.py

@@ -74,8 +74,17 @@ def test_statistics(self):
         self.check_args('/NumberField/stats', 'Class number')
 
     def test_signature_search(self):
+        # Square brackets
         self.check_args('/NumberField/?start=0&degree=6&signature=%5B0%2C3%5D&count=100', '6.0.61131.1')
         self.check_args('/NumberField/?start=0&degree=7&signature=%5B3%2C2%5D&count=100', '7.3.1420409.1')
+        # Round brackets
+        self.check_args('/NumberField/?start=0&degree=6&signature=%280%2C3%29&count=100', '6.0.61131.1')
+        self.check_args('/NumberField/?start=0&degree=7&signature=%283%2C2%29&count=100', '7.3.1420409.1')
+
+    def test_signature_display(self):
+        # Verify that signatures are displayed with parentheses, not square brackets
+        self.check_args('/NumberField/6.0.61131.1', '(0, 3)')  # degree 6 field with signature (0, 3)
+        self.check_args('/NumberField/7.3.1420409.1', '(3, 2)')  # degree 7 field with signature (3, 2)
 
     def test_relative_class_number(self):
         self.check_args('/NumberField/4.0.1327873600.2', '2108')

lmfdb/number_fields/web_number_field.py

@@ -559,6 +559,11 @@ def signature(self):
         n = self._data['degree']
         return [n-2*r2, r2]
 
+    def signature_display(self):
+        """Return signature formatted for display with parentheses."""
+        r1, r2 = self.signature()
+        return '(%s, %s)' % (r1, r2)
+
     def degree(self):
         return self._data['degree']
 

lmfdb/utils/search_parsing.py

@@ -18,9 +18,9 @@
 LIST_RE = re.compile(r"^(\d+|(\d*-(\d+)?))(,(\d+|(\d*-(\d+)?)))*$")
 FLOAT_STR = r"(-?(((\d+([.]\d*)?)|([.]\d+))(e[-+]?\d+)?)|(-?\d+/\d+))"
 LIST_FLOAT_RE = re.compile(r"^({0}|{0}-|{0}-{0})(,({0}|{0}-|{0}-{0}))*$".format(FLOAT_STR))
-BRACKETED_POSINT_RE = re.compile(r"^\[\]|\[0*[1-9]\d*(,0*[1-9]\d*)*\]$")
-BRACKETED_NN_RE = re.compile(r"^\[\]|\[\d+(,\d+)*\]$")
-BRACKETED_RAT_RE = re.compile(r"^\[\]|\[-?(\d+|\d+/\d+)(,-?(\d+|\d+/\d+))*\]$")
+BRACKETED_POSINT_RE = re.compile(r"^[\[(][\])]|[\[(]0*[1-9]\d*(,0*[1-9]\d*)*[\])]$")
+BRACKETED_NN_RE = re.compile(r"^[\[(][\])]|[\[(]\d+(,\d+)*[\])]$")
+BRACKETED_RAT_RE = re.compile(r"^[\[(][\])]|[\[(]-?(\d+|\d+/\d+)(,-?(\d+|\d+/\d+))*[\])]$")
 QQ_RE = re.compile(r"^-?\d+(/\d+)?$")
 QQ_LIST_RE = re.compile(r"^-?\d+(/\d+)?(,-?\d+(/\d+)?)*$")
 # Single non-negative rational, allowing decimals, used in parse_range2rat
@@ -896,7 +896,7 @@ def parse_bracketed_posints(
         not myregex.match(inp)
         or (maxlength is not None and inp.count(",") > maxlength - 1)
         or (exactlength is not None and inp.count(",") != exactlength - 1)
-        or (exactlength is not None and inp == "[]" and exactlength > 0)
+        or (exactlength is not None and inp in ("[]", "()") and exactlength > 0)
     ):
         if exactlength == 2:
             lstr = "pair of positive integers"
@@ -921,9 +921,9 @@ def parse_bracketed_posints(
         else:
             lstr = "list of positive integers"
             example = "[1,2,3] or [5,6]"
-        raise SearchParsingError("It needs to be a %s in square brackets, such as %s." % (lstr, example))
+        raise SearchParsingError("It needs to be a %s in square or round brackets, such as %s." % (lstr, example))
     else:
-        if (inp == "[]"):  # fixes bug in the code below (split never returns an empty list)
+        if inp in ("[]", "()"):  # fixes bug in the code below (split never returns an empty list)
             if split:
                 query[qfield] = []
             else:
@@ -995,7 +995,7 @@ def parse_bracketed_rats(
         or (maxlength is not None and inp.count(",") > maxlength - 1)
         or (minlength is not None and inp.count(",") < minlength - 1)
         or (exactlength is not None and inp.count(",") != exactlength - 1)
-        or (exactlength is not None and inp == "[]" and exactlength > 0)
+        or (exactlength is not None and inp in ("[]", "()") and exactlength > 0)
     ):
         if exactlength == 2:
             lstr = "pair of rational numbers"
@@ -1034,9 +1034,9 @@ def parse_bracketed_rats(
         else:
             lstr = "list of rational numbers"
             example = "[1/7,2,3] or [5,6/71]"
-        raise SearchParsingError("It needs to be a %s in square brackets, such as %s." % (lstr, example))
+        raise SearchParsingError("It needs to be a %s in square or round brackets, such as %s." % (lstr, example))
     else:
-        if inp == "[]":  # fixes bug in the code below (split never returns an empty list)
+        if inp in ("[]", "()"):  # fixes bug in the code below (split never returns an empty list)
             if split:
                 query[qfield] = []
             else: