Family pages

lmfdb/modular_curves/main.py

@@ -9,6 +9,7 @@
 
 from lmfdb.utils import (
     SearchArray,
+    EmbeddedSearchArray,
     TextBox,
     TextBoxWithSelect,
     SelectBox,
@@ -20,6 +21,7 @@
     display_knowl,
     flash_error,
     search_wrap,
+    embed_wrap,
     to_dict,
     parse_ints,
     parse_noop,
@@ -54,6 +56,7 @@
     formatted_dims, url_for_EC_label, url_for_ECNF_label, showj_nf, combined_data,
     learnmore_list, LABEL_RE, ISO_CLASS_RE
 )
+from lmfdb.modular_curves.family import ModCurveFamily
 from lmfdb.modular_curves.upload import ModularCurveUploader
 from lmfdb.modular_curves.isog_class import ModCurveIsog_class
 
@@ -350,7 +353,7 @@ def blankzeros(n):
 
 @search_parser
 def parse_family(inp, query, qfield):
-    if inp not in ["X0", "X1", "Xpm1", "X", "Xsp", "Xspplus", "Xns", "Xnsplus", "XS4", "X2", "Xpm2", "Xarith", "any"]:
+    if inp not in ["X0", "X1", "Xpm1", "X", "Xsp", "Xspplus", "Xns", "Xnsplus", "XS4", "Xarith1", "Xarithpm1", "Xsym", "Xarith", "any"]:
         raise ValueError
     inp = inp.replace("plus", "+")
     if inp == "any":
@@ -361,16 +364,18 @@ def parse_family(inp, query, qfield):
         query[qfield] = {"$or":[{"$like": inp + "(%"}, {"$in":["X(1)"]}]}
     elif inp == "Xsp": #add X(1),X(2)
         query[qfield] = {"$or":[{"$like": inp + "(%"}, {"$in":["X(1)","X(2)"]}]}
-    elif inp == "X2": # X_1(2,2n); add X(2)
-        query[qfield] = {"$or":[{"$like": "X1(2,%"}, {"$in":["X(2)"]}]}
-    elif inp == "Xpm2": # X_{\pm1}(2,2n); add X(2)
-        query[qfield] = {"$or":[{"$like": "Xpm1(2,%"}, {"$in":["X(2)"]}]}
+    elif inp == "Xarith1": # X_{arith,1}(m,mn); add X(2)
+        query[qfield] = {"$or":[{"$like": inp + "(%,%"}, {"$like": "X1(2,%"}, {"$in":["X(2)"]}]}
+    elif inp == "Xarithpm1": # X_{\pm1}(2,2n); add X(2)
+        query[qfield] = {"$or":[{"$like": inp + "(%,%"}, {"$like": "Xpm1(2,%"}, {"$in":["X(2)"]}]}
     elif inp == "Xpm1": # Add X(1) and X0(N) for N=2,3,4,6
         query[qfield] = {"$or":[{"$like": "Xpm1(%", "$not": {"$like": "%,%"}}, {"$in": ["X(1)", "X0(2)", "X0(3)", "X0(4)", "X0(6)"]}]}
     elif inp == "X1":
         query[qfield] = {"$or":[{"$like": "X1(%", "$not": {"$like": "%,%"}}, {"$in":["X(1)", "X0(2)"]}]}
     elif inp == "Xarith": # add X(1), X(2)
         query[qfield] = {"$or":[{"$like": inp + "(%"}, {"$in":["X(1)","X(2)"]}]}
+    elif inp == "Xarith": 
+        query[qfield] = {"$or":[{"$like": inp + "(%"}, {"$in":["X(1)","X(2)"]}]}
     else: #add X(1),X0(2)
         query[qfield] = {"$or":[{"$like": inp + "(%"}, {"$in":["X(1)","X0(2)"]}]}
 
@@ -743,7 +748,13 @@ def modcurve_search(info, query):
             raise ValueError(msg % info["covered_by"])
         query["label"] = {"$in": parents}
 
+modcurve_sorts = [
+    ("", "level", ["level", "index", "genus", "label"]),
+    ("index", "index", ["index", "level", "genus", "label"]),
+    ("genus", "genus", ["genus", "level", "index", "label"]),
+    ("rank", "rank", ["rank", "genus", "level", "index", "label"]),
 
+]
 class ModCurveSearchArray(SearchArray):
     noun = "curve"
     jump_example = "13.78.3.a.1"
@@ -922,8 +933,8 @@ def __init__(self):
                      ("X1", "X1(N)"),
                      ("Xpm1", "X±1(N)"),
                      ("X", "X(N)"),
-                     ("X2", "X1(2,2N)"),
-                     ("Xpm2", "X±1(2,2N)"),
+                     ("Xarith1", "Xarith1(M,MN)"),
+                     ("Xarithpm1", "Xarith±1(M,MN)"),
                      ("Xsp", "Xsp(N)"),
                      ("Xns", "Xns(N)"),
                      ("Xspplus", "Xsp+(N)"),
@@ -964,13 +975,9 @@ def __init__(self):
             [CPlabel],
         ]
 
-    _default = ["level", "index", "genus", "coarse_class_num", "coarse_level", "coarse_num", "fine_num"]
-    sorts = [
-        ("", "level", _default),
-        ("index", "index", ["index", "level"] + _default[2:]),
-        ("genus", "genus", ["genus"] + _default[:2] + _default[3:]),
-        ("rank", "rank", ["rank", "genus"] + _default[:2] + _default[3:]),
-    ]
+
+    sorts = modcurve_sorts
+
     null_column_explanations = {
         'simple': False,
         'squarefree': False,
@@ -979,6 +986,37 @@ def __init__(self):
         'name': False,
     }
 
+class FamilySearchArray(EmbeddedSearchArray):
+    sorts = modcurve_sorts
+
+@modcurve_page.route("/Q/family/<name>")
+def family_page(name):
+    info = to_dict(request.args, search_array=FamilySearchArray(), name=name)
+    try:
+        info["family"] = family = ModCurveFamily(name)
+    except ValueError:
+        flash_error(f"There is no family with name {name}")
+        return redirect(url_for(".index_Q"))
+    info["title"] = family.title
+    info["bread"] = family.bread
+   # info["properties"] = family.properties
+    return render_family(info)
+
+@embed_wrap(
+    table=db.gps_gl2zhat_fine,
+    template="modcurve_family.html",
+    err_title="Modular curve family error",
+    columns=modcurve_columns,
+    learnmore=learnmore_list,
+    # Each of the following arguments is set here so that it overridden when constructing template_kwds,
+    # which prioritizes values found in info (which are set in family_page() before calling render_family)
+    bread=lambda:None,
+    properties=lambda:None,
+    family=lambda:None,
+)
+def render_family(info, query):
+    parse_family(info, query, 'name')
+
 @modcurve_page.route("/Q/low_degree_points")
 def low_degree_points():
     info = to_dict(request.args, search_array=RatPointSearchArray())
@@ -1130,8 +1168,8 @@ def __init__(self):
                      ("X1", "X1(N)"),
                      ("Xpm1", "Xpm1(N)"),
                      ("X", "X(N)"),
-                     ("X2", "X1(2,2N)"),
-                     ("Xpm2", "Xpm1(2,2N)"),
+                     ("Xarith1", "Xarith1(M,MN)"),
+                     ("Xarithpm1", "Xarith±1(M,MN)"),
                      ("Xsp", "Xsp(N)"),
                      ("Xns", "Xns(N)"),
                      ("Xspplus", "Xsp+(N)"),

lmfdb/modular_curves/templates/family.html

@@ -0,0 +1,70 @@
+{% extends 'homepage.html' %}
+{% block content %}
+
+<h1> Description </h1>
+<p> {{ family.moduli_description }} </p>
+
+<h2> {{ KNOWL("modcurve.invariants", "Invariants") }} </h2>
+<table>
+  <tr>
+    <td>{{ KNOWL("modcurve.level", "Level") }}:</td>
+    <td> $N$ </td><td style="width:20px;"></td>
+    <td>{{ KNOWL("modcurve.sl2level", "$\SL_2$-level") }}:</td>
+    <td>${{ family.sl2level }}$</td><td style="width:60px;"></td>
+    {# Unclear what should happen here.
+    {% if family.genus > 0 %}
+      <td>{{ KNOWL("modcurve.newform_level", "Newform level:") }}</td>
+      <td>${{ family.newform_level }}$</td>
+      {% endif %}</tr>
+    #}
+    <tr>
+      <td>{{ KNOWL("modcurve.index", "Index") }}:</td><td> ${{ family.index }}$ </td><td style="width:20px;"></td>
+      <td>{{ KNOWL("modcurve.psl2index", "$\PSL_2$-index") }}:<td>${{ family.psl2index }}$</td></tr>
+    <tr>
+      <td>{{ KNOWL("modcurve.genus", "Genus") }}:</td>
+      {# TODO : Figure out how to modify this #}
+      <td> ${{ family.genus }} = 1 + \frac{ {{ family.psl2index }} }{12} - \frac{ {{ family.nu2 }} }{4} - \frac{ {{ family.nu3 }} }{3} - \frac{ {{ family.cusps }} }{2}$</td>
+    </tr>
+    <tr>
+      <td>{{ KNOWL("modcurve.cusps", "Cusps") }}:</td>
+      <td> {{ family.cusps_display }}</td><td style="width:20px;"></td>
+      <td>{{ KNOWL("modcurve.cusp_widths", "Cusp widths") }}</td>
+      <td>{{ family.cusp_widths_display }}</td><td style="width:60px;"></td>
+      <td>{{ KNOWL("modcurve.cusp_orbits", "Cusp orbits") }}</td>
+      <td>{{ family.cusp_orbits_display }}</td>
+    </tr>
+    <tr>
+      <td>{{ KNOWL("modcurve.elliptic_points", "Elliptic points") }}:</td>
+      <td> {{ family.elliptic_points }} </td>
+    </tr>
+    {# What should go here?
+  {% if family.genus > 0 %}
+      <tr>
+        <td>{{ KNOWL('modcurve.rank', 'Analytic rank') }}:</td>
+        <td> {% if family.rank is not none %} ${{ family.rank }}$ {% else %} not computed {% endif %} </td>
+      </tr>
+  {% endif %}
+  #}
+  {# Need to think about what should go here.  List of references?
+  <tr>
+    <td>{{ KNOWL("modcurve.gonality", "$\Q$-gonality")}}:</td>
+    <td> ${{ family.q_gonality if family.q_gonality else "%s \\le \\gamma \\le %s"%(curve.q_gonality_bounds[0],curve.q_gonality_bounds[1]) }}$ </td>
+  </tr>
+  <tr>
+    <td>{{ KNOWL("modcurve.gonality", "$\overline{\Q}$-gonality")}}:</td>
+    <td> ${{ family.qbar_gonality if family.qbar_gonality else "%s \\le \\gamma \\le %s"%(curve.qbar_gonality_bounds[0],curve.qbar_gonality_bounds[1]) }}$ </td>
+  </tr>
+  #}
+  <tr>
+    <td>{{ KNOWL("modcurve.cusps", "Rational cusps") }}:</td>
+    <td> ${{ family.rational_cusps }}$ </td>
+  </tr>
+  {# This might be possible, but let's comment it out for now.
+  <tr>
+    <td>{{ KNOWL("modcurve.cm_discriminants", "Rational CM points") }}:</td>
+    <td> {{ "yes $\quad(D =$ $%s$)"%(curve.cm_discriminant_list) if family.cm_discriminants else "none" }} </td>
+  </tr>
+  #}
+</table>
+
+{% endblock %}

lmfdb/modular_curves/templates/modcurve_browse.html

@@ -9,8 +9,8 @@ <h2> Browse </h2>
 
 <p>
   By {{KNOWL('modcurve.standard', 'family')}}:
-  {% for (fam, famname) in [("X0", "X_0(N)"), ("X1", "X_1(N)"), ("X", "X(N)"), ("Xsp", "X_{\\mathrm{sp}}(N)"), ("Xspplus", "X_{\\mathrm{sp}}^+(N)"), ("Xns", "X_{\\mathrm{ns}}(N)"), ("Xnsplus", "X_{\\mathrm{ns}}^+(N)"), ("XS4", "X_{S_4}(p)"), ("Xarith", "X_{\\mathrm{arith}}(N)")] %}
-  <a href="?family={{fam}}">${{famname}}$</a>&nbsp;
+  {% for (fam, famname) in [("X0", "X_0(N)"), ("X1", "X_1(N)"), ("Xpm1", "X_{\pm 1}(N)"), ("Xarith1", "X_{\\mathrm{arith},1}(M,MN)"), ("Xarithpm1", "X_{\\mathrm{arith},\pm 1}(M,MN)"), ("X", "X(N)"), ("Xsp", "X_{\\mathrm{sp}}(N)"), ("Xspplus", "X_{\\mathrm{sp}}^+(N)"), ("Xns", "X_{\\mathrm{ns}}(N)"), ("Xnsplus", "X_{\\mathrm{ns}}^+(N)"), ("XS4", "X_{S_4}(p)"), ("Xarith", "X_{\\mathrm{arith}}(N)")] %}
+  <a href="family/{{fam}}">${{famname}}$</a>&nbsp;
   {% endfor %}
 </p>
 

lmfdb/modular_curves/templates/modcurve_family.html

@@ -0,0 +1,52 @@
+{% extends 'embedded_results.html' %}
+{% block embedding_content %}
+
+<p>{{ family.moduli_description | safe }}</p>
+
+<h2> {{ KNOWL('modcurve.invariants', 'Invariants') }} </h2>
+<table>
+    <tr>
+      {% if family.notation %}
+         <p>Some of the invariants below will use the following notation:
+         <br>{{ family.notation|safe }}</br></p>
+      {% endif %}
+    </tr>
+    <tr>
+      <td>{{ KNOWL("modcurve.psl2index", "$\PSL_2$-index") }}:</td>
+      <td>${{ family.psl2index }}$</td>
+    </tr>
+    <tr>
+      <td>{{ KNOWL("modcurve.elliptic_points", "Elliptic points") }} of order 2:</td>
+      <td>{{ family.nu2 | safe }}</td>
+    </tr>
+    <tr>
+      <td>{{ KNOWL("modcurve.elliptic_points", "Elliptic points") }} of order 3:</td>
+      <td>{{ family.nu3 | safe }}</td>
+    </tr>
+    <tr>
+      <td>{{ KNOWL("modcurve.cusps", "Cusps") }}:</td>
+      <td> {{ family.cusps_display }}</td><td style="width:20px;"></td>
+    </tr>
+    <tr>
+      <td>{{ KNOWL("modcurve.genus", "Genus") }}:</td><td>{{ family.genus_formula }}</td>
+    </tr>
+  {# Need to think about what should go here.  List of references?
+  <tr>
+    <td>{{ KNOWL("modcurve.gonality", "$\Q$-gonality")}}:</td>
+    <td> ${{ family.q_gonality if family.q_gonality else "%s \\le \\gamma \\le %s"%(curve.q_gonality_bounds[0],curve.q_gonality_bounds[1]) }}$ </td>
+  </tr>
+  <tr>
+    <td>{{ KNOWL("modcurve.gonality", "$\overline{\Q}$-gonality")}}:</td>
+    <td> ${{ family.qbar_gonality if family.qbar_gonality else "%s \\le \\gamma \\le %s"%(curve.qbar_gonality_bounds[0],curve.qbar_gonality_bounds[1]) }}$ </td>
+  </tr>
+  #}
+</table>
+
+
+{% if family.hypell_description or family.biell_description %}
+<h2> Remarks </h2>
+<p>{{KNOWL('ag.hyperelliptic_curve', 'Hyperelliptic curves')}}: {{ family.hypell_description|safe }}</p>
+<p>{{KNOWL('ag.bielliptic_curve', 'Bielliptic curves')}}: {{ family.biell_description|safe }}</p>
+{% endif %}
+
+{% endblock %}

lmfdb/modular_curves/test_modular_curves.py

@@ -300,8 +300,8 @@ def test_family_search(self):
             ('X1','4.12.0-4.c.1.1'),
             ('Xpm1','5.12.0.a.1'),
             ('X','2.6.0.a.1'),
-            ('X2','4.24.0-4.b.1.3'),
-            ('Xpm2','6.24.0.a.1'),
+            ('Xarith1','4.24.0-4.b.1.3'),
+            ('Xarithpm1','6.24.0.a.1'),
             ('Xsp','3.12.0.a.1'),
             ('Xns','3.6.0.a.1'),
             ('Xspplus','3.6.0.b.1'),

lmfdb/modular_curves/web_curve.py

@@ -127,6 +127,7 @@ def name_to_latex(name):
     if not name:
         return ""
     name = canonicalize_name(name)
+    # Temporary measure until we update data with Xarith1 and Xarithpm1 families
     if "+" in name:
         name = name.replace("+", "^+")
     if "ns" in name:
@@ -135,6 +136,10 @@ def name_to_latex(name):
         name = name.replace("sp", r"{\mathrm{sp}}")
     elif "S4" in name:
         name = name.replace("S4", "{S_4}")
+    elif name.startswith("Xarith1"):
+        name = r"X{\mathrm{arith},1}" + name[7:]
+    elif name.startswith("Xarithpm1"):
+        name = r"X{\mathrm{arith},\pm 1}" + name[9:]
     elif "pm1" in name:
         name = name.replace("pm1", r"{\pm1}")
     elif "arith" in name:

lmfdb/static/lmfdb.js

@@ -335,7 +335,7 @@ $(function() {
 
 function update_start_by_count_and_submit_form(sign) {
   var startelem = $('form.re-search input[name=start]');
-  var count = parseInt($('form.re-search input[name=count]').val());
+  var count = parseInt($('form.re-search input[name=count]').val());;
   var newstart = parseInt(startelem.val())+sign*count;
   if(newstart<0)
     newstart = 0;

lmfdb/templates/embedded_results.html

@@ -0,0 +1,51 @@
+{% extends 'homepage.html' %}
+{% block content %}
+
+{% block embedding_content %}
+
+{% endblock %}
+
+{{ info.columns.above_results | safe }}
+{% if info.columns.languages %}
+{% set languages = info.columns.languages %}
+{% endif %}
+
+<form class='re-search'>
+  {{ info.search_array.html(info) | safe }}
+  <input type="hidden" name="showcol" value="{{info.showcol}}" />
+  <input type="hidden" name="hidecol" value="{{info.hidecol}}" />
+  <input type="hidden" name="sort_order" value="{{info.sort_order}}" />
+  <input type="hidden" name="sort_dir" value="{{info.sort_dir}}" />
+</form>
+
+{# requires info to contain number (number of results), count (max number of results possible), start (where to start in the list of results) and exact_count (boolean, indicating whether the count is exact) #}
+
+{% if info.number == 'infinity' or info.number >= info.start + info.count %}
+  {% set upper_count = info.start + info.count %}
+{% else %}
+  {% set upper_count = info.number %}
+{% endif %}
+<br>
+<div>
+  {% if info.number > info.count or info.start != 0 -%}
+    <h2 style="display: inline; color: #1565C0; font-weight: bold; font-family: sans-serif; text-decoration: none; font-size: 120%; text-align: left;">
+      Showing {{ info.start + 1 }}-{{ upper_count }} of {{ info.number }}
+    </h2>
+  {% endif %}
+  {% include 'forward_back.html' %}
+  {% include 'download_search_results.html' %}
+</div>
+
+{% include 'search_results_table.html' %}
+
+{% include 'forward_back.html' %}
+{% if info.columns.dummy_download %}
+  {% include 'dummy_download_search_results.html' %}
+{% else %}
+  {% include 'download_search_results.html' %}
+{% endif %}
+{{ info.columns.below_download | safe }}
+{% include 'debug_info.html' %}
+
+
+{% endblock %}

lmfdb/utils/__init__.py

@@ -32,8 +32,8 @@
            'parse_container', 'parse_hmf_weight', 'parse_count', 'parse_newton_polygon',
            'parse_start', 'parse_ints_to_list_flash', 'integer_options',
            'nf_string_to_label', 'clean_input', 'prep_ranges',
-           'search_wrap', 'count_wrap',
-           'SearchArray', 'TextBox', 'TextBoxNoEg', 'TextBoxWithSelect', 'BasicSpacer',
+           'search_wrap', 'count_wrap', 'embed_wrap',
+           'SearchArray', 'EmbeddedSearchArray', 'TextBox', 'TextBoxNoEg', 'TextBoxWithSelect', 'BasicSpacer',
            'SkipBox', 'CheckBox', 'CheckboxSpacer', 'DoubleSelectBox', 'HiddenBox',
            'SearchButton', 'SearchButtonWithSelect', 'RowSpacer',
            'SelectBox', 'YesNoBox', 'YesNoMaybeBox', 'ExcludeOnlyBox',
@@ -149,9 +149,9 @@
     parse_subfield, parse_interval,
     clean_input, prep_ranges, input_string_to_poly)
 
-from .search_wrapper import search_wrap, count_wrap
+from .search_wrapper import search_wrap, count_wrap, embed_wrap
 from .search_boxes import (
-    SearchArray, TextBox, TextBoxNoEg, TextBoxWithSelect, BasicSpacer,
+    SearchArray, EmbeddedSearchArray, TextBox, TextBoxNoEg, TextBoxWithSelect, BasicSpacer,
     SkipBox, CheckBox, CheckboxSpacer, DoubleSelectBox, HiddenBox,
     SelectBox, YesNoBox, YesNoMaybeBox, ExcludeOnlyBox,
     ParityBox, ParityMod, SubsetBox, SubsetNoExcludeBox, SelectBoxNoEg, CountBox,