From 9626d16da9db1ebdab776045d6595982ceb8c74e Mon Sep 17 00:00:00 2001
From: kalmar <kalmar@amu.edu.pl>
Date: Thu, 22 Jun 2017 15:04:51 +0200
Subject: [PATCH] merge modules DirectProducts, WreathProducts into Groups

---
 src/DirectProducts.jl | 12 +-----------
 src/Groups.jl         |  7 ++++++-
 src/WreathProducts.jl | 14 +-------------
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/src/DirectProducts.jl b/src/DirectProducts.jl
index c0332bf..df722f7 100644
--- a/src/DirectProducts.jl
+++ b/src/DirectProducts.jl
@@ -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
diff --git a/src/Groups.jl b/src/Groups.jl
index a4ba1e0..3df7fe1 100644
--- a/src/Groups.jl
+++ b/src/Groups.jl
@@ -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
diff --git a/src/WreathProducts.jl b/src/WreathProducts.jl
index 24aa589..82ccc77 100644
--- a/src/WreathProducts.jl
+++ b/src/WreathProducts.jl
@@ -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