kalmar
/
Groups.jl
mirror of https://github.com/kalmarek/Groups.jl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

rework reduce! and sumplify_perms! using delete_ids!

This commit is contained in:
kalmarek 2018-03-29 19:23:24 +02:00
parent 40cf8a4e9f
commit d83af99fbc
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/AutGroup.jl
View File

@ -331,30 +331,26 @@ end
function simplify_perms!(W::Automorphism{N}) where N
reduced = true
to_delete = Int[]
for i in 1:length(W.symbols)-1
if isa(W.symbols[i].typ, PermAut) && isa(W.symbols[i+1].typ, PermAut)
if W.symbols[i].pow == 0
continue
elseif isa(W.symbols[i].typ, PermAut) && isa(W.symbols[i+1].typ, PermAut)
reduced = false
c = W.symbols[i]
n = W.symbols[i+1]
p = (getperm(c)*getperm(n)).d
if p == PermutationGroup(N)()
push!(to_delete, i, i+1)
else
W.symbols[i+1].typ.perm.d = p
push!(to_delete, i)
end
W.symbols[i+1].typ.perm.d = p
end
end
deleteat!(W.symbols, to_delete)
delete_ids!(W)
return reduced
end
function reduce!(W::Automorphism)
if length(W.symbols) == 0
if length(W) == 0
return W
elseif length(W.symbols) == 1 && W.symbols[1].pow == 0
deleteat!(W.symbols, 1)
elseif length(W)< 2
delete_ids!(W)
W.modified = true
else
reduced = false
@ -362,7 +358,6 @@ function reduce!(W::Automorphism)
reduced = simplify_perms!(W) && free_reduce!(W)
end
end
deleteat!(W.symbols, find(x -> x.pow == 0, W.symbols))
W.modified = true