From f939a2ae27f472d628ce3ce317c8f8c60ebd252b Mon Sep 17 00:00:00 2001 From: kalmar Date: Wed, 19 Jul 2017 13:33:55 +0200 Subject: [PATCH] Revert "Type experiment: parametrise GroupRingElem after types of its parent" This reverts commit 75a83da8cbecc5b45215bf4c90206d3f3badb95d. --- src/GroupRings.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/GroupRings.jl b/src/GroupRings.jl index ffe8460..41bac97 100644 --- a/src/GroupRings.jl +++ b/src/GroupRings.jl @@ -34,9 +34,9 @@ GroupRing{Gr<:Group}(G::Gr;initialise=true) = GroupRing{Gr, elem_type(G)}(G, ini GroupRing{Gr<:Group, T<:GroupElem}(G::Gr, b::Vector{T}, b_d::Dict{T,Int}, pm::Array{Int,2}) = GroupRing{Gr, T}(G, b, b_d, pm) -type GroupRingElem{T<:Number, Gr<:Group, GrEl<:GroupElem} <: RingElem +type GroupRingElem{T<:Number} <: RingElem coeffs::AbstractVector{T} - parent::GroupRing{Gr, GrEl} + parent::GroupRing function GroupRingElem(c::AbstractVector{T}, RG::GroupRing, check=true) if check @@ -81,8 +81,8 @@ end # ############################################################################### -function GroupRingElem{T<:Number, Gr<:Group, GrEl<:GroupElem}(c::AbstractVector{T}, RG::GroupRing{Gr, GrEl}) - return GroupRingElem{T, Gr, GrEl}(c, RG) +function GroupRingElem{T<:Number}(c::AbstractVector{T}, RG::GroupRing) + return GroupRingElem{T}(c, RG) end function GroupRing(G::Group, pm::Array{Int,2})