From 96e17b9d87ad07ebcc6ef8de86aed909dfff8833 Mon Sep 17 00:00:00 2001
From: John Cremona <john.cremona@gmail.com>
Date: Fri, 6 Dec 2024 05:21:23 -0500
Subject: [PATCH] ECNF: BSD formula tweaks, no display or error when not all
 data available

---
 lmfdb/ecnf/WebEllipticCurve.py       | 49 +++++++++++++++-------------
 lmfdb/ecnf/templates/ecnf-curve.html |  6 +++-
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/lmfdb/ecnf/WebEllipticCurve.py b/lmfdb/ecnf/WebEllipticCurve.py
index 2c6838e3cb..8ce2afac53 100644
--- a/lmfdb/ecnf/WebEllipticCurve.py
+++ b/lmfdb/ecnf/WebEllipticCurve.py
@@ -639,38 +639,43 @@ def make_E(self):
         # Check analytic Sha value compatible with formula in the knowl (see issue #5409)
 
         BSDrootdisc = RR(K.discriminant().abs()).sqrt()
-        if BSDLvalue and BSDsha and BSDReg and BSDsha:
+        if BSDLvalue and BSDsha and BSDReg and (self.rank is not None):
             BSDsha_numerator = BSDrootdisc * BSDntors**2
             BSDsha_denominator = BSDReg * BSDomega * BSDprodcp
             BSDsha_from_formula = BSDLvalue * BSDsha_numerator / BSDsha_denominator
             BSDLvalue_from_formula = BSDsha * BSDsha_denominator / BSDsha_numerator
             self.BSDsha = web_latex(BSDsha_from_formula)
             self.BSDLvalue = web_latex(BSDLvalue_from_formula)
+
+            # The BSD formula for display
+
+            dot = '\\cdot'
+            approx = '\\approx'
+            frac = '\\frac'
+            Sha = '\\# &#1064;(E/K)'
+            Om = '\\Omega(E/K)'
+            Reg = '\\mathrm{Reg}_{\\mathrm{NT}}(E/K)'
+            prodcp = '\\prod_{\\mathfrak{p}} c_{\\mathfrak{p}}'
+            tors2 = '\\#E(K)_{\\mathrm{tor}}^2'
+            rootD = '\\left|d_K\\right|^{1/2}'
+
+            lder_name  = rf"L^{{({r})}}(E/K,1)/{r}!" if r>=2 else "L'(E/K,1)" if r else "L(E/K,1)"
+            lhs_num    = rf'{Sha} {dot} {Om} {dot} {Reg} {dot} {prodcp}'
+            lhs_den    = rf'{tors2} {dot} {rootD}'
+            lhs        = rf'{frac}{{ {lhs_num} }} {{ {lhs_den} }}'
+            rhs_num    = rf'{BSDsha} {dot} {BSDomega:0.6f} {dot} {BSDReg} {dot} {BSDprodcp}'
+            if r:
+                rhs_num    = rf'{BSDsha} {dot} {BSDomega:0.6f} {dot} {BSDReg:0.6f} {dot} {BSDprodcp}'
+            rhs_den    = rf'{{{BSDntors}^2 {dot} {BSDrootdisc:0.6f}}}'
+            rhs        = rf'{frac}{{ {rhs_num} }} {{ {rhs_den} }}'
+            self.bsd_formula = rf'{BSDLvalue:0.9f} {approx} {lder_name} = {lhs} {approx} {rhs} {approx} {BSDLvalue_from_formula:0.9f}'
+
         else:
             self.BSDsha = "not available"
             self.BSDLvalue = "not available"
+            self.bsd_formula = None
 
-        # The BSD formula for display
-
-        dot = '\\cdot'
-        approx = '\\approx'
-        frac = '\\frac'
-        Sha = '\\# &#1064;(E/K)'
-        Om = '\\Omega(E/K)'
-        Reg = '\\mathrm{Reg}_{\\mathrm{NT}}(E/K)'
-        prodcp = '\\prod_{\\mathfrak{p}} c_{\\mathfrak{p}}'
-        tors2 = '\\#E(K)_{\\mathrm{tor}}^2'
-        rootD = '\\left|D_K\\right|'
-
-        lder_name  = rf"L^{({r})}(E,1)/{r}!" if r>=2 else "L'(E,1)" if r else "L(E,1)"
-        lhs_num    = rf'{Sha} {dot} {Om} {dot} {Reg} {dot} {prodcp}'
-        lhs_den    = rf'{tors2} {dot} {rootD}'
-        lhs        = rf'{frac}{{ {lhs_num} }} {{ {lhs_den} }}'
-        rhs_num    = rf'{BSDsha} {dot} {BSDomega:0.6f} {dot} {BSDReg:0.6f} {dot} {BSDprodcp}'
-        rhs_den    = rf'{{{BSDntors}^2 {dot} {BSDrootdisc:0.6f}}}'
-        rhs        = rf'{frac}{{ {rhs_num} }} {{ {rhs_den} }}'
-        self.bsd_formula = rf'{BSDLvalue:0.9f} {approx} {lder_name} = {lhs} {approx} {rhs} {approx} {BSDLvalue_from_formula:0.9f}'
-
+        print(f"BSD: {self.bsd_formula}")
         # Local data
 
         # The Kodaira symbol is stored as an int in pari encoding. The
diff --git a/lmfdb/ecnf/templates/ecnf-curve.html b/lmfdb/ecnf/templates/ecnf-curve.html
index 03442abe92..e288520570 100644
--- a/lmfdb/ecnf/templates/ecnf-curve.html
+++ b/lmfdb/ecnf/templates/ecnf-curve.html
@@ -274,7 +274,7 @@ <h2> {{ KNOWL('ec.bsdconjecture', title='BSD invariants') }}</h2>
 	<tr>
 	  <td align='left'>{{ KNOWL('ec.rank', title="Mordell-Weil rank")}}:</td>
 	  {% if ec.rk == "not available" %}
-	  <td>$r$?</td>
+	  <td>$r?$</td>
 	  <td>&nbsp;</td>
 	  {% if ec.rank_bounds != "not available" %}
 	  <td>\({{ ec.rk_lb }} \le r \le {{ec.rk_ub}}\)</td>
@@ -395,6 +395,8 @@ <h2> {{ KNOWL('ec.bsdconjecture', title='BSD invariants') }}</h2>
 {% endif %}
 </div>
 
+{% if ec.bsd_formula %}
+
 <h2> {{ KNOWL('ec.bsdconjecture', title='BSD formula') }}</h2>
 <div>
 <p style="margin:10px 280px;">
@@ -405,6 +407,8 @@ <h2> {{ KNOWL('ec.bsdconjecture', title='BSD formula') }}</h2>
 </center>
 </div>
 
+{% endif %}
+
 <h2>{{KNOWL('ec.local_data', title='Local data')}} at {{KNOWL('ec.bad_reduction', title='primes of bad reduction')}} </h2>
 <div>
  {{ place_code('localdata') }}