1
0
mirror of https://github.com/kalmarek/Groups.jl.git synced 2024-10-31 18:00:35 +01:00

merge modules DirectProducts, WreathProducts into Groups

This commit is contained in:
kalmar 2017-06-22 15:04:51 +02:00
parent 00f5fc1f23
commit 9626d16da9
3 changed files with 8 additions and 25 deletions

View File

@ -1,12 +1,4 @@
module DirectProducts
using Nemo
import Base: show, ==, hash, deepcopy_internal
import Base: ×, *, inv
import Nemo: parent, parent_type, elem_type
import Nemo: elements, order, Group, GroupElem, Ring
import Base: ×
export DirectProductGroup, DirectProductGroupElem
@ -244,5 +236,3 @@ doc"""
"""
order(G::DirectProductGroup) = prod([order(H) for H in G.factors])
end # of module DirectProduct

View File

@ -1,7 +1,9 @@
module Groups
using Nemo
import Nemo: Group, parent, parent_type, elem_type
import Nemo: Group, GroupElem, Ring
import Nemo: parent, parent_type, elem_type
import Nemo: elements, order
import Base: length, ==, hash, show, convert
import Base: inv, reduce, *, ^
@ -372,4 +374,7 @@ end
include("FreeGroup.jl")
include("AutGroup.jl")
include("DirectProducts.jl")
include("WreathProducts.jl")
end # of module Groups

View File

@ -1,12 +1,4 @@
module WreathProducts
using Nemo
using DirectProducts
import Base: convert, deepcopy_internal, show, isequal, ==, hash, size, inv
import Base: +, -, *, //
import Nemo: Group, GroupElem, elem_type, parent_type, parent, elements, order
export WreathProduct, WreathProductElem
###############################################################################
#
@ -48,8 +40,6 @@ type WreathProductElem <: GroupElem
end
end
export WreathProduct, WreathProductElem
###############################################################################
#
# Type and parent object methods
@ -232,5 +222,3 @@ function elements(G::WreathProduct)
end
order(G::WreathProduct) = order(G.P)*order(G.N)
end # of module WreatProduct