Merge pull request #6904 from havarddj/d3-diagrams

Diagram search (using d3.js)

Author: AndrewVSutherland

lmfdb/artin_representations/main.py

@@ -528,6 +528,7 @@ class ArtinSearchArray(SearchArray):
     jump_egspan = "e.g. 4.5648.6t13.b.a"
     jump_knowl = "artin.search_input"
     jump_prompt = "Label"
+    has_diagram = False
 
     def __init__(self):
         dimension = TextBox(

lmfdb/belyi/main.py

@@ -888,6 +888,7 @@ def labels_page():
 class BelyiCommonSearchArray(SearchArray):
     jump_knowl = "belyi.search_input"
     jump_label = "Label"
+    has_diagram = False
 
     def __init__(self):
         self.deg = TextBox(

lmfdb/bianchi_modular_forms/bianchi_modular_form.py

@@ -706,7 +706,8 @@ class BMFSearchArray(SearchArray):
     jump_egspan = "e.g. 2.0.4.1-65.2-a (single form) or 2.0.4.1-65.2 (space of forms at a level)"
     jump_prompt = "Label"
     jump_knowl = "mf.bianchi.search_input"
-
+    has_diagram = False
+    
     def __init__(self):
         field = TextBox(
             name='field_label',

lmfdb/classical_modular_forms/main.py

@@ -168,7 +168,7 @@ def index():
         # hidden_search_type for prev/next buttons
         info['search_type'] = search_type = info.get('search_type', info.get('hst', ''))
 
-        if search_type in ['List', '', 'Random']:
+        if search_type in ['List', '', 'Random', 'Diagram']:
             return newform_search(info)
         elif search_type in ['Spaces', 'RandomSpace']:
             return space_search(info)
@@ -931,7 +931,12 @@ def _AL_col(i, p):
              },
              url_for_label=url_for_label,
              bread=get_search_bread,
-             learnmore=learnmore_list)
+             learnmore=learnmore_list,
+             diagram_opts={"x_axis_default": "level",
+                           "y_axis_default": "weight",
+                           "color_default": "dim",
+                           "extra_fields": ["level"],
+                           })
 def newform_search(info, query):
     newform_parse(info, query)
     set_info_funcs(info)
@@ -1231,7 +1236,11 @@ def dimension_space_search(info, query):
                         'download':CMF_download().download_spaces},
              url_for_label=url_for_label,
              bread=get_search_bread,
-             learnmore=learnmore_list)
+             learnmore=learnmore_list,
+             diagram_opts={"x_axis_default": "level",
+                           "y_axis_default": "weight",
+                           "color_default": "dim",
+                           })
 def space_search(info, query):
     newspace_parse(info, query)
     set_info_funcs(info)
@@ -1774,10 +1783,12 @@ def search_types(self, info):
         basic = [('', 'List of forms'),
                  ('Dimensions', 'Dimension table'),
                  ('Traces', 'Traces table'),
-                 ('Random', 'Random form')]
+                 ('Random', 'Random form'),
+                 ('Diagram', 'Diagram search')]
         spaces = [('Spaces', 'List of spaces'),
                   ('SpaceDimensions', 'Dimension table'),
-                  ('RandomSpace', 'Random')]
+                  ('RandomSpace', 'Random'),
+                  ('Diagram', 'Diagram search')]
         if info is None:
             return basic
         st = self._st(info)

lmfdb/ecnf/main.py

@@ -359,6 +359,10 @@ def url_for_label(label):
     nf, cond_label, iso_label, number = split_full_label(label.strip())
     return url_for("ecnf.show_ecnf", nf=nf, conductor_label=cond_label, class_label=iso_label, number=number)
 
+def ecnf_label_builder(row):
+    """Build full ECNF label from database row fields for diagram search."""
+    return f"{row['field_label']}-{row['conductor_label']}-{row['iso_label']}{row['number']}"
+
 def make_cm_query(cm_disc_str):
     cm_list = parse_ints_to_list_flash(cm_disc_str, "CM discriminant", max_val=None)
     for d in cm_list:
@@ -475,7 +479,12 @@ def postprocess(self, row, info, query):
                         'download':ECNFDownloader()},
              url_for_label=url_for_label,
              learnmore=learnmore_list,
-             bread=lambda:[('Elliptic curves', url_for(".index")), ('Search results', '.')])
+             bread=lambda:[('Elliptic curves', url_for(".index")), ('Search results', '.')],
+             diagram_opts={"x_axis_default": "conductor_norm",
+                           "y_axis_default": "rank",
+                           "color_default": "torsion_order",
+                           "label_builder": ecnf_label_builder,
+                           })
 def elliptic_curve_search(info, query):
     parse_nf_string(info,query,'field',name="base number field",qfield='field_label')
     if query.get('field_label') == '1.1.1.1':

lmfdb/elliptic_curves/elliptic_curve.py

@@ -526,7 +526,14 @@ def createrecord_code(self, lang, column_names):
              shortcuts={'jump':elliptic_curve_jump,
                         'download':ECDownloader()},
              bread=lambda:get_bread('Search results'),
-             postprocess=ec_postprocess)
+             postprocess=ec_postprocess,
+             diagram_opts={
+                 "title": "Elliptic curve diagrams",
+                 "bread": lambda: get_bread("Diagram search"),
+                 "label_builder": lambda r: r["lmfdb_label"],
+                 "x_axis_default": "conductor",
+                 "y_axis_default": "regulator",
+             })
 def elliptic_curve_search(info, query):
     parse_rational_to_list(info, query, 'jinv', 'j-invariant')
     parse_ints(info, query, 'conductor')

lmfdb/elliptic_curves/test_ell_curves.py

@@ -219,3 +219,14 @@ def test_underlying_data(self):
         #        'ec_localdata' in data and 'tamagawa_number' in data and
         #        'ec_galrep' in data and "'modell_image'" in data and
         #        'ec_padic' in data and 'unit' in data)
+
+    def test_diagram_search(self):
+        """
+        Check that diagram search page loads correctly
+        """
+        # Test with a search that returns results
+        L = self.tc.get('/EllipticCurve/Q/?conductor=11-100&search_type=Diagram&count=100')
+        data = L.get_data(as_text=True)
+        # Check that D3 diagram template elements are present
+        assert 'my_dataviz' in data
+        assert 'pointRadius' in data

lmfdb/galois_groups/main.py

@@ -137,6 +137,7 @@ def make_order_key(order):
 gg_columns = SearchColumns([
     LinkCol("label", "gg.label", "Label", url_for_label),
     SearchCol("pretty", "gg.simple_name", "Name"),
+    MathCol("n", "gg.degree", "Degree", short_title="degree", default=False),
     MathCol("order", "group.order", "Order", align="right"),
     MathCol("parity", "gg.parity", "Parity", align="right"),
     CheckCol("solv", "group.solvable", "Solvable"),
@@ -152,7 +153,8 @@ def make_order_key(order):
                       lambda sibs, bnd, cache: WebGaloisGroup(None, {"siblings":sibs, "bound_siblings":bnd}).otherrep_list(givebound=False, cache=cache),
                       apply_download=lambda s, b, c: [s, b])
 ],
-    db_cols=["bound_siblings", "abstract_label", "label", "name", "order", "parity", "pretty", "siblings", "solv", "subfields", "nilpotency", "num_conj_classes","auts"])
+
+    db_cols=["bound_siblings", "abstract_label", "label", "name", "n", "order", "parity", "pretty", "siblings", "solv", "subfields", "nilpotency", "num_conj_classes", "auts"])
 #gg_columns.below_download = r"<p>Results are complete for degrees $\leq 23$.</p>"
 
 def gg_postprocess(res, info, query):
@@ -180,7 +182,15 @@ def gg_postprocess(res, info, query):
              url_for_label=url_for_label,
              postprocess=gg_postprocess,
              learnmore=learnmore_list,
-             bread=lambda: get_bread([("Search results", ' ')]))
+             bread=lambda: get_bread([("Search results", ' ')]),
+             diagram_opts={
+                 "title": "Galois group diagram search",
+                 "bread": lambda: get_bread(breads=[("Diagram search", " ")]),
+                 "x_axis_default": "n",
+                 "y_axis_default": "num_conj_classes",
+                 "color_default": "nilpotency",
+             }
+             )
 def galois_group_search(info, query):
     if info.get('jump','').strip():
         jump_list = ["1T1", "2T1", "3T1", "4T1", "4T2", "5T1", "6T1", "7T1",
@@ -230,6 +240,7 @@ def galois_group_search(info, query):
 
     _set_show_subs(info)
 
+
 def yesno(val):
     if val:
         return 'yes'

lmfdb/genus2_curves/main.py

@@ -635,7 +635,14 @@ class G2C_download(Downloader):
     columns=g2c_columns,
     bread=lambda: get_bread("Search results"),
     learnmore=learnmore_list,
-    url_for_label=lambda label: url_for(".by_label", label=label),
+    url_for_label=url_for_curve_label,
+    diagram_opts={
+        "title": "Genus 2 curve diagram search",
+        "bread": lambda: get_bread("Diagram search"),
+        "x_axis_default": "cond",
+        "y_axis_default": "regulator",
+        "color_default": "two_selmer_rank",
+    },
 )
 def genus2_curve_search(info, query):
     parse_ints(info, query, "abs_disc", "absolute discriminant")
@@ -945,6 +952,7 @@ def g2c_code_download(**args):
         response.headers['Content-type'] = 'text/html'
     return response
 
+
 class G2CSearchArray(SearchArray):
     noun = "curve"
 

lmfdb/groups/abstract/main.py

@@ -779,7 +779,7 @@ def index():
         info["search_type"] = search_type = info.get(
             "search_type", info.get("hst", "")
         )
-        if search_type in ["List", "", "Random"]:
+        if search_type in ["List", "", "Random", "Diagram"]:
             return group_search(info)
         elif search_type in ["Subgroups", "RandomSubgroup"]:
             info["search_array"] = SubgroupSearchArray()
@@ -790,6 +790,7 @@ def index():
         elif search_type in ["ConjugacyClasses"]:  # no random since lots of groups with cc don't have characters also computed
             info["search_array"] = ConjugacyClassSearchArray()
             return conjugacy_class_search(info)
+
     info["stats"] = GroupStats()
     info["count"] = 50
     info["order_list"] = ["1-64", "65-127", "128", "129-255", "256", "257-383", "384", "385-511", "513-1000", "1001-1500", "1501-2000", "2001-"]
@@ -1405,6 +1406,10 @@ def group_postprocess(res, info, query):
     #  credit=lambda:credit_string,
     url_for_label=url_for_label,
     postprocess=group_postprocess,
+    diagram_opts={
+        "title": "Abstract group diagrams",
+        "bread": lambda: get_bread([("Diagram search", "")]),
+    },
 )
 def group_search(info, query={}):
     group_parse(info, query)
@@ -2565,6 +2570,11 @@ def download_group(**args):
     #strIO.seek(0)
     #return send_file(strIO, attachment_filename=filename, as_attachment=True, add_etags=False)
 
+@abstract_page.route("/search_diagram/")
+def browseDiagram():
+    info = to_dict(request.args, search_array=GroupsSearchArray())
+    info["search_type"] = "Diagram"
+    return group_search(info)
 
 class GroupsSearchArray(SearchArray):
     noun = "group"