Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some type stability issue #1191

Merged
merged 3 commits into from
Aug 28, 2023
Merged

Fix some type stability issue #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e541ea2
fix some stability
StevellM Aug 25, 2023
76305cb
better solution
StevellM Aug 25, 2023
85f7962
apparently vcat! does not exist
StevellM Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 22 additions & 25 deletions src/QuadForm/Lattices.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,10 +1060,10 @@ end

# TODO: add jldoctest
@doc raw"""
trace_lattice_with_isometry(H::AbstractLat{T}; alpha::FieldElem = one(base_field(H)),
beta::FieldElem = gen(base_field(H)),
order::Integer = 2) where T
-> ZZLat, QQMatrix
trace_lattice_with_isometry(H::AbstractLat{T};
alpha::FieldElem = one(base_field(H)),
beta::FieldElem = gen(base_field(H)),
order::Integer = 2) where T -> ZZLat, QQMatrix

Given a lattice `H` which is either:

Expand Down Expand Up @@ -1096,15 +1096,16 @@ function trace_lattice_with_isometry(H::AbstractLat{T}; alpha::FieldElem = one(b
beta::FieldElem = gen(base_field(H)),
order::Integer = 2) where T

return trace_lattice_with_isometry_and_transfer_data(H, alpha=alpha, beta=beta, order=order)[1:2]
return trace_lattice_with_isometry_and_transfer_data(H; alpha, beta, order)[1:2]
end

# TODO: add jldoctest
@doc raw"""
trace_lattice_with_isometry_and_transfer_data(H::AbstractLat{T}; alpha::FieldElem = one(base_field(H)),
beta::FieldElem = gen(base_field(H)),
order::Integer = 2) where T
-> ZZLat, QQMatrix, AbstractSpaceRes
trace_lattice_with_isometry_and_transfer_data(H::AbstractLat{T};
alpha::FieldElem = one(base_field(H)),
beta::FieldElem = gen(base_field(H)),
order::Integer = 2) where T
-> ZZLat, QQMatrix, AbstractSpaceRes

Return the trace lattice of `H` together with the associated isometry corresponding
to multiplication by `beta` (see [`trace_lattice(::AbstractLat)`](@ref)) and with
Expand All @@ -1123,7 +1124,6 @@ function trace_lattice_with_isometry_and_transfer_data(H::AbstractLat{T}; alpha:

n = degree(H)

# will be useful to shorten code of lattices with isometry on Oscar
if E == QQ
@req order in [1,2] "For ZZLat the order must be 1 or 2"
V = ambient_space(H)
Expand Down Expand Up @@ -1152,7 +1152,7 @@ function trace_lattice_with_isometry_and_transfer_data(H::AbstractLat{T}; alpha:
v2 = res(v)
v2 = beta.*v2
v3 = (res\v2)
iso = vcat(iso, transpose(matrix(v3)))
iso = vcat(iso, matrix(QQ, 1, length(v3), v3))::QQMatrix
v[i] = zero(QQ)
end

Expand Down Expand Up @@ -1190,7 +1190,7 @@ function trace_lattice_with_isometry(H::HermLat, res::AbstractSpaceRes; beta::Fi
v2 = res(v)
v2 = beta.*v2
v3 = (res\v2)
iso = vcat(iso, transpose(matrix(v3)))
iso = vcat(iso, matrix(QQ, 1, length(v3), v3))::QQMatrix
v[i] = zero(QQ)
end

Expand Down Expand Up @@ -1243,7 +1243,7 @@ end
#TODO: add jldoctest
@doc raw"""
hermitian_structure(L::ZZLat, f::QQMatrix; check::Bool = true
ambient_representation::Bool = true)
ambient_representation::Bool = true)
-> HermLat

Given a $\mathbb{Z}$-lattice `L` together with an isometry `f` with irreducible minimal polynomial,
Expand All @@ -1262,20 +1262,17 @@ If `check == true`, then the function checks whether the minimal polynomial of t
span of `L` is irreducible.
"""
function hermitian_structure(L::ZZLat, f::QQMatrix; check::Bool = true,
ambient_representation::Bool = true,
res = nothing,
E = nothing)

return hermitian_structure_with_transfer_data(L, f, check=check,
ambient_representation = ambient_representation,
res = res,
E = E)[1]
ambient_representation::Bool = true,
res = nothing,
E = nothing)

return hermitian_structure_with_transfer_data(L, f; check, ambient_representation, res, E)[1]
end

# TODO: add jldoctest
@doc raw"""
hermitian_structure_with_transfer_data(L::ZZLat, f::QQMatrix; check::Bool = true,
ambient_representation::Bool = true)
ambient_representation::Bool = true)
-> HermLat, AbstractSpaceRes

Given a $\mathbb{Z}$-lattice `L` together with an isometry `f` with irreducible minimal polynomial,
Expand All @@ -1294,9 +1291,9 @@ If `check == true`, then the function checks whether the minimal polynomial of t
span of `L` is irreducible.
"""
function hermitian_structure_with_transfer_data(_L::ZZLat, f::QQMatrix; check::Bool = true,
ambient_representation::Bool = true,
res = nothing,
E = nothing)
ambient_representation::Bool = true,
res = nothing,
E = nothing)

# Since the minimal polynomial of f might not be irreducible, but the one
# of its restriction to _L is, we are only concerned about _L inside
Expand Down
11 changes: 6 additions & 5 deletions src/QuadForm/Torsion.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,7 @@ function _isometry_semiregular(T::TorQuadModule, U::TorQuadModule)
return (false, hz)
end
NTtoNU = hom(NT, NU, identity_matrix(ZZ, ngens(NT)))
TtoU = compose(TtoNT, compose(NTtoNU, inv(UtoNU)))
TtoU = hom(T, U, TorQuadModuleElem[UtoNU\(NTtoNU(TtoNT(a))) for a in gens(T)])
@hassert :Lattice 1 is_bijective(TtoU)
@hassert :Lattice 1 all(a -> a*a == TtoU(a)*TtoU(a), gens(T))
return (true, TtoU)
Expand Down Expand Up @@ -1058,7 +1058,7 @@ function _isometry_degenerate(T::TorQuadModule, U::TorQuadModule)
D = block_diagonal_matrix([I, M])
phi = hom(Tsub, Usub, D)
@hassert :Lattice 1 is_bijective(phi)
TtoU = compose(inv(TsubinT), compose(phi, UsubinU))
TtoU = hom(T, U, TorQuadModuleElem[UsubinU(phi(TsubinT\(a))) for a in gens(T)])
@hassert :Lattice 1 all(a -> a*a == TtoU(a)*TtoU(a), gens(T))
return (true, TtoU)
end
Expand All @@ -1074,7 +1074,8 @@ function _isometry_non_split_degenerate(T::TorQuadModule, U::TorQuadModule)
f = pop!(waiting)
i = length(f)
if i == n
return (true, compose(inv(TstoT), hom(Ts, U, f)))
TstoU = hom(Ts, U, f)
return (true, hom(T, U, TorQuadModuleElem[TstoU(TstoT\(a)) for a in gens(T)]))
end

t = Ts[i+1]
Expand Down Expand Up @@ -1216,7 +1217,7 @@ function is_isometric_with_isometry(T::TorQuadModule, U::TorQuadModule)
Uabs, UabstoUab = snf(abelian_group(U))
fabs = hom(Tabs, Uabs, identity_matrix(ZZ, length(elementary_divisors(T))))
fab = compose(inv(TabstoTab), compose(fabs, UabstoUab))
return true, hom(T, U, fab.map)
return true, hom(T, U, matrix(fab))
else
is_zero(gram_matrix_quadratic(U)) && return (false, hz)
end
Expand Down Expand Up @@ -1346,7 +1347,7 @@ function is_anti_isometric_with_anti_isometry(T::TorQuadModule, U::TorQuadModule
Uabs, UabstoUab = snf(abelian_group(U))
fabs = hom(Tabs, Uabs, identity_matrix(ZZ, length(elementary_divisors(T))))
fab = compose(inv(TabstoTab), compose(fabs, UabstoUab))
return true, hom(T, U, fab.map)
return true, hom(T, U, matrix(fab))
else
is_zero(gram_matrix_quadratic(U)) && return (false, hz)
end
Expand Down
Loading