Skip to content

Commit a6ad616

Browse files
committed
suggested details
1 parent 708cb04 commit a6ad616

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

src/sage/interfaces/khoca.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def prepare_data(data):
182182
for i in data:
183183
# i[0]: degree, i[1]: height, i[2]: torsion i[3]: rank
184184
d, h, t, r = i
185-
# make d compatibil with Sage
185+
# make d compatible with Sage
186186
d = int(t / 2) - d
187187
if (h, d, t) in data_as_dict:
188188
data_as_dict[(h, d, t)] += r
@@ -210,6 +210,6 @@ def prepare_data(data):
210210
if isinstance(red, bool):
211211
if red:
212212
return raw_data['red']
213-
else:
214-
raise TypeError('reduced must be a boolean')
213+
else:
214+
raise TypeError('reduced must be a boolean')
215215
return raw_data['unred']

src/sage/rings/finite_rings/integer_mod_ring.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,32 +1972,32 @@ def _roots_univariate_polynomial(self, f, ring=None, multiplicities=True, algori
19721972
if deg < 0:
19731973
# All residue classes are roots of the zero polynomial
19741974
return [*map(self, range(self.cardinality()))]
1975-
elif deg == 0:
1975+
if deg == 0:
19761976
return []
1977-
elif deg == 1:
1977+
if deg == 1:
19781978
# assume form a*x + b
19791979
b, a = f.list()
19801980
if a.is_unit():
19811981
return [-b * (~a)]
1982-
else:
1983-
al, bl = a.lift(), b.lift()
1984-
1985-
N = self.order()
1986-
g = N.gcd(al)
1987-
1988-
if bl % g != 0:
1989-
return [] # No solution
1990-
else:
1991-
# whole eqn divided by g
1992-
N_by_g = N.divide_knowing_divisible_by(g)
1993-
a_by_g = al.divide_knowing_divisible_by(g)
1994-
_R = Zmod(N_by_g)
1995-
assert _R(a_by_g).is_unit()
1996-
1997-
# single root
1998-
_root = self(f.roots(_R, multiplicities=False)[0])
1999-
inc = self(N_by_g)
2000-
return [_root + k * inc for k in range(g)]
1982+
1983+
al, bl = a.lift(), b.lift()
1984+
1985+
N = self.order()
1986+
g = N.gcd(al)
1987+
1988+
if bl % g != 0:
1989+
return [] # No solution
1990+
1991+
# whole eqn divided by g
1992+
N_by_g = N.divide_knowing_divisible_by(g)
1993+
a_by_g = al.divide_knowing_divisible_by(g)
1994+
_R = Zmod(N_by_g)
1995+
assert _R(a_by_g).is_unit()
1996+
1997+
# single root
1998+
_root = self(f.roots(_R, multiplicities=False)[0])
1999+
inc = self(N_by_g)
2000+
return [_root + k * inc for k in range(g)]
20012001

20022002
# Finite fields are a base case
20032003
if self.is_field():

0 commit comments

Comments
 (0)