rename Delta -> Laplacian, splaplacian -> spLaplacian

This commit is contained in:
kalmarek 2018-01-02 00:07:05 +01:00
parent b43482325d
commit 13f49027dd
3 changed files with 9 additions and 9 deletions

View File

@ -182,7 +182,7 @@ function compute_orbit_data{T<:GroupElem}(logger, name::String, G::Nemo.Group, S
info(logger, "Product matrix")
@logtime logger pm = GroupRings.create_pm(E_2R, E_rdict, sizes[radius], twisted=true)
RG = GroupRing(G, E_2R, E_rdict, pm)
Δ = PropertyT.splaplacian(RG, S)
Δ = PropertyT.spLaplacian(RG, S)
@assert GroupRings.augmentation(Δ) == 0
save(joinpath(name, "delta.jld"), "Δ", Δ.coeffs)
save(joinpath(name, "pm.jld"), "pm", pm)

View File

@ -80,7 +80,7 @@ filename(prefix::String, ::Type{Val{:Δ}}) = joinpath(prefix, "delta.jld")
filename(prefix::String, ::Type{Val{}}) = joinpath(prefix, "lambda.jld")
filename(prefix::String, ::Type{Val{:P}}) = joinpath(prefix, "SDPmatrix.jld")
function Delta(name::String, G::Group)
function Laplacian(name::String, G::Group)
info(LOGGER, "Loading precomputed Δ...")
if exists(filename(name, )) && exists(filename(name, :pm))
RG = GroupRing(G, load(filename(name, :pm), "pm"))
@ -91,15 +91,15 @@ function Delta(name::String, G::Group)
return Δ
end
function Delta{T<:GroupElem}(name::String, S::Vector{T}, Id::T; radius::Int=2)
function Laplacian{T<:GroupElem}(name::String, S::Vector{T}, Id::T; radius::Int=2)
info(LOGGER, "Computing multiplication table, Δ...")
Δ = Delta(S, Id, radius=radius)
Δ = Laplacian(S, Id, radius=radius)
save(filename(name, :pm), "pm", parent(Δ).pm)
save(filename(name, ), "Δ", Δ.coeffs)
return Δ
end
function Delta{T<:GroupElem}(S::Vector{T}, Id::T; radius::Int=2)
function Laplacian{T<:GroupElem}(S::Vector{T}, Id::T; radius::Int=2)
info(LOGGER, "Generating metric ball of radius $radius...")
@logtime LOGGER E_R, sizes = Groups.generate_balls(S, Id, radius=2*radius)
info(LOGGER, "Generated balls of sizes $sizes.")
@ -188,10 +188,10 @@ function check_property_T(name::String, S, Id, solver, upper_bound, tol, radius)
if exists(filename(name, :pm)) && exists(filename(name, ))
# cached
Δ = Delta(name, parent(S[1]))
Δ = Laplacian(name, parent(S[1]))
else
# compute
Δ = Delta(name, S, Id, radius=radius)
Δ = Laplacian(name, S, Id, radius=radius)
end
if exists(filename(name, )) && exists(filename(name, :P))

View File

@ -13,7 +13,7 @@ function constraints(pm, total_length=maximum(pm))
return constraints
end
function splaplacian(RG::GroupRing, S, T::Type=Float64)
function spLaplacian(RG::GroupRing, S, T::Type=Float64)
result = RG(T)
result[RG.group()] = T(length(S))
for s in S
@ -22,7 +22,7 @@ function splaplacian(RG::GroupRing, S, T::Type=Float64)
return result
end
function splaplacian{TT<:Ring}(RG::GroupRing{TT}, S, T::Type=Float64)
function spLaplacian{TT<:Ring}(RG::GroupRing{TT}, S, T::Type=Float64)
result = RG(T)
result[one(RG.group)] = T(length(S))
for s in S