kalmar/Groups.jl
1
0
Fork 0
mirror of https://github.com/kalmarek/Groups.jl.git synced 2024-12-05 02:11:27 +01:00
Code Issues Releases Wiki Activity

rename Automorphism.typ -> Automorphism.fn

Browse Source
This commit is contained in:
kalmarek 2018-07-30 14:54:09 +02:00
parent d78f1ec38a
commit 5ac1ea7ba8
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/AutGroup.jl
View File

@ -27,7 +27,7 @@ struct Identity end
struct AutSymbol <: GSymbol struct AutSymbol <: GSymbol
str::String str::String
pow::Int8 pow::Int8
typ::Union{LTransvect, RTransvect, PermAut, FlipAut, Identity} fn::Union{LTransvect, RTransvect, PermAut, FlipAut, Identity}
end end
mutable struct AutGroup{N} <: AbstractFPGroup mutable struct AutGroup{N} <: AbstractFPGroup
@ -204,10 +204,8 @@ end
############################################################################### ###############################################################################
function (f::AutSymbol)(v::NTuple{N, T}) where {N, T} function (f::AutSymbol)(v::NTuple{N, T}) where {N, T}
if f.pow == 0 if f.pow != 0
nothing v = f.fn(v, f.pow)::NTuple{N, T}
else
v = f.typ(v, f.pow)::NTuple{N, T}
end end
return v return v
end end
@ -271,20 +269,20 @@ function change_pow(s::AutSymbol, n::Integer)
if n == zero(n) if n == zero(n)
return id_autsymbol() return id_autsymbol()
end end
symbol = s.typ symbol = s.fn
if isa(symbol, FlipAut) if symbol isa FlipAut
return flip_autsymbol(symbol.i, pow=n) return flip_autsymbol(symbol.i, pow=n)
elseif isa(symbol, PermAut) elseif symbol isa PermAut
return perm_autsymbol(symbol.perm, pow=n) return perm_autsymbol(symbol.perm, pow=n)
elseif isa(symbol, RTransvect) elseif symbol isa RTransvect
return rmul_autsymbol(symbol.i, symbol.j, pow=n) return rmul_autsymbol(symbol.i, symbol.j, pow=n)
elseif isa(symbol, LTransvect) elseif symbol isa LTransvect
return lmul_autsymbol(symbol.i, symbol.j, pow=n) return lmul_autsymbol(symbol.i, symbol.j, pow=n)
elseif isa(symbol, Identity) elseif symbol isa Identity
return s return s
else else
warn("Changing power of an unknown type of symbol! $s") warn("Changing power of an unknown type of symbol! $s")
return AutSymbol(s.str, n, s.typ) return AutSymbol(s.str, n, s.fn)
end end
end end
@ -324,9 +322,9 @@ inv(f::AutSymbol) = change_pow(f, -f.pow)
function getperm(s::AutSymbol) function getperm(s::AutSymbol)
if s.pow != 1 if s.pow != 1
warn("Power for perm_symbol should be never 0!") warn("Power for perm_symbol should be never 0!")
return s.typ.perm^s.pow return s.fn.perm^s.pow
else else
return s.typ.perm return s.fn.perm
end end
end end
@ -336,7 +334,7 @@ function simplifyperms!(W::Automorphism{N}) where N
for i in 1:length(W.symbols)-1 for i in 1:length(W.symbols)-1
if W.symbols[i].pow == 0 if W.symbols[i].pow == 0
continue continue
elseif isa(W.symbols[i].typ, PermAut) && isa(W.symbols[i+1].typ, PermAut) elseif W.symbols[i].fn isa PermAut && W.symbols[i+1].fn isa PermAut
reduced = false reduced = false
c = W.symbols[i] c = W.symbols[i]
n = W.symbols[i+1] n = W.symbols[i+1]
@ -370,7 +368,7 @@ function linear_repr(A::Automorphism{N}, hom=matrix_repr) where N
return reduce(*, hom(Identity(), N, 1), linear_repr.(A.symbols, N, hom)) return reduce(*, hom(Identity(), N, 1), linear_repr.(A.symbols, N, hom))
end end
linear_repr(a::AutSymbol, n::Int, hom) = hom(a.typ, n, a.pow) linear_repr(a::AutSymbol, n::Int, hom) = hom(a.fn, n, a.pow)
function matrix_repr(a::Union{RTransvect, LTransvect}, n::Int, pow) function matrix_repr(a::Union{RTransvect, LTransvect}, n::Int, pow)
x = eye(n) x = eye(n)