mirror of
https://github.com/kalmarek/Groups.jl.git
synced 2024-12-25 18:15:29 +01:00
separate hashing and freereduce
This commit is contained in:
parent
43ad81d4dd
commit
e84152a9cf
@ -18,9 +18,8 @@ include("types.jl")
|
|||||||
include("gsymbols.jl")
|
include("gsymbols.jl")
|
||||||
include("fallbacks.jl")
|
include("fallbacks.jl")
|
||||||
include("words.jl")
|
include("words.jl")
|
||||||
|
include("hashing.jl")
|
||||||
@doc doc"""
|
include("freereduce.jl")
|
||||||
"""
|
|
||||||
|
|
||||||
include("FreeGroup.jl")
|
include("FreeGroup.jl")
|
||||||
include("FPGroups.jl")
|
include("FPGroups.jl")
|
||||||
@ -29,83 +28,6 @@ include("AutGroup.jl")
|
|||||||
include("DirectPower.jl")
|
include("DirectPower.jl")
|
||||||
include("WreathProducts.jl")
|
include("WreathProducts.jl")
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
#
|
|
||||||
# Type and parent object methods
|
|
||||||
#
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
parent(w::GWord{T}) where {T<:GSymbol} = w.parent
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
#
|
|
||||||
# ParentType / ObjectType constructors
|
|
||||||
#
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
#
|
|
||||||
# Basic manipulation
|
|
||||||
#
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
function hash_internal(W::GWord)
|
|
||||||
reduce!(W)
|
|
||||||
return hash(syllables(W), hash(typeof(W), hash(parent(W))))
|
|
||||||
end
|
|
||||||
|
|
||||||
function hash(W::GWord, h::UInt)
|
|
||||||
if ismodified(W)
|
|
||||||
W.savedhash = hash_internal(W)
|
|
||||||
unsetmodified!(W)
|
|
||||||
end
|
|
||||||
return xor(W.savedhash, h)
|
|
||||||
end
|
|
||||||
|
|
||||||
# WARNING: Due to specialised (constant) hash function of GWords this one is actually necessary!
|
|
||||||
function deepcopy_internal(W::T, dict::IdDict) where {T<:GWord}
|
|
||||||
G = parent(W)
|
|
||||||
return G(T(deepcopy(syllables(W))))
|
|
||||||
end
|
|
||||||
|
|
||||||
function freereduce!(::Type{Bool}, w::GWord)
|
|
||||||
reduced = true
|
|
||||||
for i in 1:syllablelength(w)-1
|
|
||||||
s, ns = syllables(w)[i], syllables(w)[i+1]
|
|
||||||
if isone(s)
|
|
||||||
continue
|
|
||||||
elseif s.id == ns.id
|
|
||||||
reduced = false
|
|
||||||
setmodified!(w)
|
|
||||||
p1 = s.pow
|
|
||||||
p2 = ns.pow
|
|
||||||
|
|
||||||
syllables(w)[i+1] = change_pow(s, p1 + p2)
|
|
||||||
syllables(w)[i] = change_pow(s, 0)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
filter!(!isone, syllables(w))
|
|
||||||
return reduced
|
|
||||||
end
|
|
||||||
|
|
||||||
function freereduce!(w::GWord)
|
|
||||||
reduced = false
|
|
||||||
while !reduced
|
|
||||||
reduced = freereduce!(Bool, w)
|
|
||||||
end
|
|
||||||
return w
|
|
||||||
end
|
|
||||||
|
|
||||||
reduce!(w::GWord) = freereduce!(w)
|
|
||||||
|
|
||||||
@doc doc"""
|
|
||||||
reduce(w::GWord)
|
|
||||||
> performs reduction/simplification of a group element (word in generators).
|
|
||||||
> The default reduction is the free group reduction
|
|
||||||
> More specific procedures should be dispatched on `GWord`s type parameter.
|
|
||||||
|
|
||||||
"""
|
|
||||||
reduce(w::GWord) = reduce!(deepcopy(w))
|
|
||||||
|
|
||||||
@doc doc"""
|
@doc doc"""
|
||||||
gens(G::AbstractFPGroups)
|
gens(G::AbstractFPGroups)
|
||||||
@ -141,17 +63,6 @@ function show(io::IO, s::T) where {T<:GSymbol}
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
#
|
|
||||||
# Comparison
|
|
||||||
#
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
function (==)(W::T, Z::T) where T <: GWord
|
|
||||||
parent(W) != parent(Z) && return false
|
|
||||||
hash(W) != hash(Z) && return false
|
|
||||||
return syllables(W) == syllables(Z)
|
|
||||||
end
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
#
|
#
|
||||||
# Binary operators
|
# Binary operators
|
||||||
|
43
src/freereduce.jl
Normal file
43
src/freereduce.jl
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# Naive reduction
|
||||||
|
#
|
||||||
|
|
||||||
|
function freereduce!(::Type{Bool}, w::GWord)
|
||||||
|
reduced = true
|
||||||
|
for i in 1:syllablelength(w)-1
|
||||||
|
s, ns = syllables(w)[i], syllables(w)[i+1]
|
||||||
|
if isone(s)
|
||||||
|
continue
|
||||||
|
elseif s.id == ns.id
|
||||||
|
reduced = false
|
||||||
|
setmodified!(w)
|
||||||
|
p1 = s.pow
|
||||||
|
p2 = ns.pow
|
||||||
|
|
||||||
|
syllables(w)[i+1] = change_pow(s, p1 + p2)
|
||||||
|
syllables(w)[i] = change_pow(s, 0)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
filter!(!isone, syllables(w))
|
||||||
|
return reduced
|
||||||
|
end
|
||||||
|
|
||||||
|
function freereduce!(w::GWord)
|
||||||
|
reduced = false
|
||||||
|
while !reduced
|
||||||
|
reduced = freereduce!(Bool, w)
|
||||||
|
end
|
||||||
|
return w
|
||||||
|
end
|
||||||
|
|
||||||
|
reduce!(w::GWord) = freereduce!(w)
|
||||||
|
|
||||||
|
@doc doc"""
|
||||||
|
reduce(w::GWord)
|
||||||
|
> performs reduction/simplification of a group element (word in generators).
|
||||||
|
> The default reduction is the free group reduction
|
||||||
|
> More specific procedures should be dispatched on `GWord`s type parameter.
|
||||||
|
|
||||||
|
"""
|
||||||
|
reduce(w::GWord) = reduce!(deepcopy(w))
|
34
src/hashing.jl
Normal file
34
src/hashing.jl
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# hashing, deepcopy and ==
|
||||||
|
#
|
||||||
|
|
||||||
|
function hash_internal(W::GWord)
|
||||||
|
reduce!(W)
|
||||||
|
h = hasparent(W) ? hash(parent(W)) : zero(UInt)
|
||||||
|
return hash(syllables(W), hash(typeof(W), h))
|
||||||
|
end
|
||||||
|
|
||||||
|
function hash(W::GWord, h::UInt)
|
||||||
|
if ismodified(W)
|
||||||
|
savehash!(W, hash_internal(W))
|
||||||
|
unsetmodified!(W)
|
||||||
|
end
|
||||||
|
return xor(savedhash(W), h)
|
||||||
|
end
|
||||||
|
|
||||||
|
# WARNING: Due to specialised (constant) hash function of GWords this one is actually necessary!
|
||||||
|
function Base.deepcopy_internal(W::T, dict::IdDict) where T<:GWord
|
||||||
|
G = parent(W)
|
||||||
|
g = T(deepcopy(syllables(W)))
|
||||||
|
setparent!(g, G)
|
||||||
|
return g
|
||||||
|
end
|
||||||
|
|
||||||
|
function (==)(W::T, Z::T) where T <: GWord
|
||||||
|
hash(W) != hash(Z) && return false # distinguishes parent and parentless words
|
||||||
|
if hasparent(W) && hasparent(Z)
|
||||||
|
parent(W) != parent(Z) && return false
|
||||||
|
end
|
||||||
|
return syllables(W) == syllables(Z)
|
||||||
|
end
|
Loading…
Reference in New Issue
Block a user