From 4491078b9e2f85f3f8b62f7835e95413a4a140fc Mon Sep 17 00:00:00 2001
From: kalmar <kalmar@amu.edu.pl>
Date: Wed, 17 May 2017 17:40:32 +0200
Subject: [PATCH] adapt GroupRing constructors to new type definition

---
 src/GroupRings.jl | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/GroupRings.jl b/src/GroupRings.jl
index 8048889..ec98485 100644
--- a/src/GroupRings.jl
+++ b/src/GroupRings.jl
@@ -77,12 +77,23 @@ function GroupRing(G::Group, pm::Array{Int,2})
    return GroupRing(G, pm)
 end
 
-function GroupRing(G::Group, pm::Array{Int,2}, basis::Vector)
+function GroupRing(G::Group, basis::Vector)
+   basis_dict = reverse_dict(basis)
+   pm = try
+      create_pm(basis, basis_dict)
+   catch err
+      isa(err, KeyError) && throw("Products are not supported on basis")
+      throw(err)
+   end
+   return GroupRing(G, basis, basis_dict, pm)
+end
+
+function GroupRing(G::Group, basis::Vector, pm::Array{Int,2})
    size(pm,1) == size(pm,2) || throw("pm must be of size (n,n), got
       $(size(pm))")
    eltype(basis) == elem_type(G) || throw("basis must consist of elements of $G")
    basis_dict = reverse_dict(basis)
-   return GroupRing(Group, pm, basis, basis_dict)
+   return GroupRing(G, basis, basis_dict, pm)
 end
 
 ###############################################################################