Merge pull request #6128 from thofma/th/oscar2

Update Oscar code to version 1.0
LMFDB · Aug 6, 2024 · a33e874 · a33e874
2 parents e91cd7f + 999609f
commit a33e874
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lmfdb/elliptic_curves/code.yaml b/lmfdb/elliptic_curves/code.yaml
@@ -35,7 +35,7 @@ curve:
   sage:  E = EllipticCurve({ainvs})
   pari:  E = ellinit({ainvs})
   magma: E := EllipticCurve({ainvs});
-  oscar: E = EllipticCurve({ainvs})
+  oscar: E = elliptic_curve({ainvs})
 
 simple_curve:
   sage: E.short_weierstrass_model()

diff --git a/lmfdb/number_fields/code.yaml b/lmfdb/number_fields/code.yaml
@@ -24,7 +24,7 @@ field:
   sage: x = polygen(QQ);  K.<a> = NumberField(%s)
   pari: K = bnfinit(%s, 1)
   magma: R<x> := PolynomialRing(Rationals()); K<a> := NumberField(%s);
-  oscar: Qx, x = PolynomialRing(QQ); K, a = NumberField(%s)
+  oscar: Qx, x = polynomial_ring(QQ); K, a = number_field(%s)
 
 poly:
   sage:  K.defining_polynomial()

diff --git a/lmfdb/number_fields/number_field.py b/lmfdb/number_fields/number_field.py
@@ -777,15 +777,15 @@ def interesting():
     'gp' : '',
     'magma' : 'R<x> := PolynomialRing(Rationals());',
     'mathematica' : '',
-    'oscar' : 'Rx, x = PolynomialRing(QQ)',
+    'oscar' : 'Rx, x = polynomial_ring(QQ)',
     'sage' : 'x = polygen(QQ)',
 }
 
 download_makedata = {
     'gp' : '', # don't try to make fields in gp, even with nfinit it may take a very long time
     'magma' : 'function make_data() return [NumberField(r[2]) : r in data]; end function;',
     'mathematica' : '',
-    'oscar' : 'function make_data() return [NumberField(r[2]) for r in data] end',
+    'oscar' : 'function make_data() return [number_field(r[2]) for r in data] end',
     'sage' : 'def make_data(): return [NumberField(r[1],"a") for r in data]',
 }
 download_makedata_comment = {