mirror of
https://github.com/kalmarek/PropertyT.jl.git
synced 2024-11-22 16:05:27 +01:00
rework loading/saving GroupRingElems
This commit is contained in:
parent
10d319f48b
commit
0614bf268d
@ -207,11 +207,12 @@ function check_property_T(sett::Settings)
|
||||
|
||||
if isfile(filename(sett,:Δ))
|
||||
# cached
|
||||
Δ = loadLaplacian(filename(sett,:Δ), sett.G)
|
||||
@info("Loading precomputed Δ...")
|
||||
Δ = loadGRElem(filename(sett,:Δ), sett.G)
|
||||
else
|
||||
# compute
|
||||
Δ = Laplacian(sett.S, sett.radius)
|
||||
saveLaplacian(filename(sett, :Δ), Δ)
|
||||
saveGRElem(filename(sett, :Δ), Δ)
|
||||
end
|
||||
|
||||
if !sett.warmstart && isfile(filename(sett, :solution))
|
||||
|
@ -45,19 +45,24 @@ function Laplacian(S, Id, radius)
|
||||
return Δ
|
||||
end
|
||||
|
||||
function saveGRElem(filename::String, g::GroupRingElem)
|
||||
function saveGRElem(fname::String, g::GroupRingElem)
|
||||
RG = parent(g)
|
||||
JLD.save(filename, "coeffs", g.coeffs, "pm", RG.pm, "G", RG.group)
|
||||
JLD.save(fname, "coeffs", g.coeffs, "pm", RG.pm, "G", RG.group)
|
||||
end
|
||||
|
||||
function loadGRElem(fname::String, RG::GroupRing)
|
||||
coeffs = load(fname, "coeffs")
|
||||
return GroupRingElem(coeffs, RG)
|
||||
end
|
||||
|
||||
function loadGRElem(fname::String, G::Group)
|
||||
if isfile(fname)
|
||||
@info("Loading precomputed Δ...")
|
||||
coeffs, pm = load(fname, "coeffs", "pm")
|
||||
pm = load(fname, "pm")
|
||||
RG = GroupRing(G, pm)
|
||||
Δ = GroupRingElem(coeffs, RG)
|
||||
else
|
||||
throw(ErrorException("You need to precompute $fname first!"))
|
||||
return loadGRElem(fname, RG)
|
||||
end
|
||||
return Δ
|
||||
|
||||
function loadGRElem(fname::String)
|
||||
pm, G = load(fname, "pm", "G")
|
||||
RG = GroupRing(G, pm)
|
||||
return loadGRElem(fname, RG)
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user