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

different data format for pc group serialization #3018

Merged
merged 5 commits into from
Jan 21, 2024
Merged

different data format for pc group serialization #3018

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
179d779
different data format for pc group serialization
ThomasBreuer Nov 14, 2023
540f422
use Antony's hints
ThomasBreuer Nov 14, 2023
ead45cb
some obvious simplifications
ThomasBreuer Nov 15, 2023
7c91530
adjust to changed `load_object` syntax
ThomasBreuer Jan 12, 2024
5df2ada
fixed type assertion (funny)
ThomasBreuer Jan 13, 2024
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
107 changes: 47 additions & 60 deletions src/Serialization/GAP.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@
fam = GAPWrap.ElementsFamily(GAPWrap.FamilyObj(F))
Ggens = [GAPWrap.ObjByExtRep(fam, GapObj(x, true)) for x in generators]
# Create the subgroup.
G = GAP.Globals.SubgroupNC(F, GapObj(Ggens))
G = GAP.Globals.SubgroupNC(F, GapObj(Ggens))::GapObj
else
# Create a new full free group.
wfilt = getproperty(GAP.Globals, load_object(s, Symbol, :wfilt))
wfilt = getproperty(GAP.Globals, load_object(s, Symbol, :wfilt))::GapObj
if haskey(s, :nameprefix)
# infinite rank
prefix = load_node(s, :nameprefix) do nameprefix
Expand All @@ -145,12 +145,12 @@
init = load_node(s, :names) do names
GapObj([GapObj(x) for x in names], true)
end
G = GAP.Globals.FreeGroup(wfilt, GAP.Globals.infinity, prefix, init)
G = GAP.Globals.FreeGroup(wfilt, GAP.Globals.infinity, prefix, init)::GapObj
else
init = load_node(s, :names) do names
GapObj([GapObj(x) for x in names], true)
end
G = GAP.Globals.FreeGroup(wfilt, init)
G = GAP.Globals.FreeGroup(wfilt, init)::GapObj
end
end
return G
Expand Down Expand Up @@ -204,7 +204,7 @@
gens = [GAPWrap.ObjByExtRep(elfreefam, GapObj(x, true)) for x in generators]
Ggens = [GAPWrap.ElementOfFpGroup(elfam, x) for x in gens]
# Create the subgroup.
G = GAP.Globals.SubgroupNC(F, GapObj(Ggens))
G = GAP.Globals.SubgroupNC(F, GapObj(Ggens))::GapObj
else
# Create a new full f.p. group.
F = load_typed_object(s, :freeGroup)
Expand All @@ -223,7 +223,7 @@
# we do not support (de)serialization of the stored rws,
# thus we need not (de)serialize its underlying free group etc.

# utility, turn an expomemt vector `[a_1, a_2, ..., a_n]`
# utility, turn an exponent vector `[a_1, a_2, ..., a_n]`
# into `[1, a_1, 2, a_2, ..., n, a_n]`
function _free_group_extrep_from_exponents(exps::Vector{Int})
res = Int[]
Expand All @@ -239,42 +239,36 @@
install_GAP_serialization(:IsPcGroup,
function(X::GapObj, s::SerializerState)
elfam = GAPWrap.ElementsFamily(GAPWrap.FamilyObj(X))
fullpcgs = GAP.getbangproperty(elfam, :DefiningPcgs)
if GAP.Globals.IsIdenticalObj(fullpcgs, GAP.Globals.Pcgs(X))
fullpcgs = GAP.getbangproperty(elfam, :DefiningPcgs)::GapObj
if GAP.Globals.IsIdenticalObj(fullpcgs, GAPWrap.Pcgs(X))
# full pc group: Save the defining data.
save_data_dict(s) do
save_object(s, "IsPcGroup", :GapType)
# relative orders
relord = [GAP.Globals.RelativeOrderOfPcElement(fullpcgs, x)
relord = [GAP.Globals.RelativeOrderOfPcElement(fullpcgs, x)::GAP.Obj
for x in fullpcgs]
save_object(s, relord, :relord)
# power relators
reli = []
rels = []
rels = Tuple{Int, Vector{Int}}[]
for i in 1:length(relord)
ne = fullpcgs[i]^relord[i]
if ! GAP.Globals.IsOne(ne)
push!(reli, i)
push!(rels, _free_group_extrep_from_exponents(
Vector{Int}(GAP.Globals.ExponentsOfPcElement(fullpcgs, ne))))
if ! GAPWrap.IsOne(ne)
push!(rels, (i, _free_group_extrep_from_exponents(

Check warning on line 256 in src/Serialization/GAP.jl

View check run for this annotation

Codecov / codecov/patch

src/Serialization/GAP.jl#L256 

Added line #L256 was not covered by tests
Vector{Int}(GAP.Globals.ExponentsOfPcElement(fullpcgs, ne)::GapObj))))
end
end
save_object(s, reli, :power_reli)
save_object(s, rels, :power_rels)
# commutator relators
reli = []
rels = []
rels = Tuple{Int, Int, Vector{Int}}[]
for i in 1:(length(relord)-1)
for j in (i+1):length(relord)
ne = GAP.Globals.Comm(fullpcgs[j], fullpcgs[i])
if ! GAP.Globals.IsOne(ne)
push!(reli, (j, i))
push!(rels, _free_group_extrep_from_exponents(
Vector{Int}(GAP.Globals.ExponentsOfPcElement(fullpcgs, ne))))
ne = GAP.Globals.Comm(fullpcgs[j], fullpcgs[i])::GapObj
if ! GAPWrap.IsOne(ne)
push!(rels, (j, i, _free_group_extrep_from_exponents(
Vector{Int}(GAP.Globals.ExponentsOfPcElement(fullpcgs, ne)::GapObj))))
end
end
end
save_object(s, reli, :comm_reli)
save_object(s, rels, :comm_rels)
end
else
Expand All @@ -283,49 +277,42 @@
save_object(s, "IsPcGroup", :GapType)
G = GAP.getbangproperty(fullpcgs, :GroupOfPcgs)::GapObj
save_typed_object(s, G, :fullGroup)
save_object(s, [Vector{Int}(GAP.Globals.ExponentsOfPcElement(fullpcgs, x))
for x in GAP.Globals.InducedPcgsWrtHomePcgs(X)], :gens)
save_object(s, [Vector{Int}(GAP.Globals.ExponentsOfPcElement(fullpcgs, x)::GapObj)
for x in GAP.Globals.InducedPcgsWrtHomePcgs(X)::GapObj], :gens)
end
end
end)

install_GAP_deserialization(
:IsPcGroup,
function(filt::GapObj, s::DeserializerState, T)
load_node(s) do d
if haskey(s, :relord)
# full pc group
relord = load_object(s, Vector, Int, :relord)
F = GAP.Globals.FreeGroup(GAP.Globals.IsSyllableWordsFamily,
length(relord))
fam = GAPWrap.ElementsFamily(GAPWrap.FamilyObj(F))
rws = GAP.Globals.SingleCollector(F, GapObj(relord))::GapObj
reli = load_object(s, Vector, Int, :power_reli)
rels = load_object(s, Vector, (Vector{Int}, Int), :power_rels)
for k in 1:length(reli)
GAP.Globals.SetPower(rws, reli[k],
GapObj(GAPWrap.ObjByExtRep(fam, GapObj(rels[k]))))
end
reli = load_object(s, Vector, (Vector{Int}, Int), :comm_reli)
rels = load_object(s, Vector, (Vector{Int}, Int), :comm_rels)
for k in 1:length(reli)
(j, i) = reli[k]
GAP.Globals.SetCommutator(rws, j, i,
GapObj(GAPWrap.ObjByExtRep(fam, GapObj(rels[k]))))
end
G = GAP.Globals.GroupByRwsNC(rws)
else
# Deserialize the full pc group.
F = load_typed_object(s, :fullGroup)
elfam = GAPWrap.ElementsFamily(GAPWrap.FamilyObj(F))
fullpcgs = GAP.getbangproperty(elfam, :DefiningPcgs)::GapObj
# Deserialize the generators.
generators = load_object(s, Vector, (Vector{Int}, Int), :gens)
Ggens = [GAP.Globals.PcElementByExponentsNC(fullpcgs, GapObj(x, true))::GapObj
for x in generators]
# Create the subgroup.
G = GAP.Globals.SubgroupNC(F, GapObj(Ggens))
if haskey(s, :relord)
# full pc group
relord = load_object(s, Vector, Int, :relord)
F = GAP.Globals.FreeGroup(GAP.Globals.IsSyllableWordsFamily,
length(relord))::GapObj
fam = GAPWrap.ElementsFamily(GAPWrap.FamilyObj(F))
rws = GAP.Globals.SingleCollector(F, GapObj(relord))::GapObj
for (i, elm) in load_object(s, Vector, (Tuple, [Int, [Vector, Int]]), :power_rels)
GAP.Globals.SetPower(rws, i,

Check warning on line 297 in src/Serialization/GAP.jl

View check run for this annotation

Codecov / codecov/patch

src/Serialization/GAP.jl#L297 

Added line #L297 was not covered by tests
GapObj(GAPWrap.ObjByExtRep(fam, GapObj(elm))))
end
return G
for (j, i, elm) in load_object(s, Vector, (Tuple, [Int, Int, [Vector, Int]]), :comm_rels)
GAP.Globals.SetCommutator(rws, j, i,
GapObj(GAPWrap.ObjByExtRep(fam, GapObj(elm))))
end
G = GAP.Globals.GroupByRwsNC(rws)::GapObj
else
# Deserialize the full pc group.
F = load_typed_object(s, :fullGroup)
elfam = GAPWrap.ElementsFamily(GAPWrap.FamilyObj(F))
fullpcgs = GAP.getbangproperty(elfam, :DefiningPcgs)::GapObj
# Deserialize the generators.
generators = load_object(s, Vector, (Vector{Int}, Int), :gens)
Ggens = [GAP.Globals.PcElementByExponentsNC(fullpcgs, GapObj(x, true))::GapObj
for x in generators]
# Create the subgroup.
G = GAP.Globals.SubgroupNC(F, GapObj(Ggens))::GapObj
end
return G
end)
Loading