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

newnew version of hash and ==

This commit is contained in:
kalmarek 2018-03-29 19:24:15 +02:00
parent d83af99fbc
commit d1db939a63
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Groups.jl
View File

@ -94,11 +94,7 @@ convert(::Type{GroupWord{T}}, s::T) where {T<:GSymbol} = GroupWord{T}(T[s])
###############################################################################
function hash(W::GWord, h::UInt)
if W.modified
reduce!(W)
W.savedhash = hash(W.symbols, hash(typeof(W), hash(parent(W), zero(UInt))))
W.modified = false
end
W.modified && reduce!(W)
return xor(W.savedhash, h)
end
@ -148,8 +144,9 @@ function reduce!(W::GWord)
reduced = free_reduce!(W)
end
end
deleteat!(W.symbols, find(x -> x.pow == 0, W.symbols))
W.modified = true
W.savedhash = hash(W.symbols, hash(typeof(W), hash(parent(W), zero(UInt))))
W.modified = false
return W
end
@ -210,8 +207,8 @@ end
function (==)(W::GWord, Z::GWord)
parent(W) == parent(Z) || return false
W.modified && hash(W)
Z.modified && hash(Z)
W.modified && reduce!(W)
Z.modified && reduce!(Z)
if W.savedhash != Z.savedhash
return false