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

move to the new syntax of v0.6

This commit is contained in:
kalmarek 2017-09-14 17:31:27 +02:00
parent b0cce16dfa
commit 439be34d21
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/GroupRings.jl
View File

@ -13,7 +13,7 @@ import Base: convert, show, hash, ==, +, -, *, //, /, length, norm, rationalize,
baseless_warn = false baseless_warn = false
type GroupRing{Gr<:Group, T<:GroupElem} <: Ring mutable struct GroupRing{Gr<:Group, T<:GroupElem} <: Ring
group::Gr group::Gr
basis::Vector{T} basis::Vector{T}
basis_dict::Dict{T, Int} basis_dict::Dict{T, Int}
@ -36,19 +36,22 @@ type GroupRing{Gr<:Group, T<:GroupElem} <: Ring
end end
end end
GroupRing{Gr<:Group, T<:GroupElem}(G::Gr, basis::Vector{T}; fastm::Bool=true) = function GroupRing(G::Gr, basis::Vector{T}; fastm::Bool=true) where {Gr<:Group, T<:GroupElem}
GroupRing{Gr, T}(G, basis, fastm=fastm) return GroupRing{Gr, T}(G, basis, fastm=fastm)
end
GroupRing(G::Gr, b::Vector{T}, b_d::Dict{T,Int}, pm::Array{Int,2}) where {Gr<:Group, T<:GroupElem} = GroupRing{Gr, T}(G, b, b_d, pm) function GroupRing(G::Gr, b::Vector{T}, b_d::Dict{T,Int}, pm::Array{Int,2}) where {Gr<:Group, T<:GroupElem}
return GroupRing{Gr, T}(G, b, b_d, pm)
end
GroupRing{Gr<:Group}(G::Gr, pm::Array{Int,2}) = GroupRing(G::Gr, pm::Array{Int,2}) where {Gr<:Group} =
GroupRing{Gr, elem_type(G)}(G, pm) GroupRing{Gr, elem_type(G)}(G, pm)
type GroupRingElem{T<:Number} <: RingElem mutable struct GroupRingElem{T, A<:AbstractVector} <: RingElem
coeffs::AbstractVector{T} coeffs::A
parent::GroupRing parent::GroupRing
function GroupRingElem{T}(c::AbstractVector{T}, RG::GroupRing, check=true) where {T<:Number} function GroupRingElem{T, A}(c::AbstractVector{T}, RG::GroupRing, check=true) where {T, A}
if check if check
if isdefined(RG, :basis) if isdefined(RG, :basis)
length(c) == length(RG.basis) || throw( length(c) == length(RG.basis) || throw(
@ -70,17 +73,20 @@ export GroupRing, GroupRingElem, complete!, create_pm, star
# #
############################################################################### ###############################################################################
elem_type{T,S}(::Type{GroupRing{T,S}}) = GroupRingElem elem_type(::Type{GroupRing}) = GroupRingElem
parent_type(::Type{GroupRingElem}) = GroupRing
eltype(X::GroupRingElem) = eltype(X.coeffs) eltype(X::GroupRingElem) = eltype(X.coeffs)
parent(g::GroupRingElem) = g.parent parent(g::GroupRingElem) = g.parent
Base.promote_rule{T<:Number,S<:Number}(::Type{GroupRingElem{T}}, ::Type{GroupRingElem{S}}) = GroupRingElem{promote_type(T,S)} parent_type(X::GroupRingElem) = typeof(parent(X))
function convert{T<:Number}(::Type{T}, X::GroupRingElem) import Base.promote_rule
promote_rule(::Type{GroupRingElem{T}}, ::Type{GroupRingElem{S}}) where {T,S} =
GroupRingElem{promote_type(T,S)}
function convert(::Type{T}, X::GroupRingElem) where {T}
return GroupRingElem(convert(AbstractVector{T}, X.coeffs), parent(X)) return GroupRingElem(convert(AbstractVector{T}, X.coeffs), parent(X))
end end
@ -90,8 +96,8 @@ end
# #
############################################################################### ###############################################################################
function GroupRingElem{T<:Number}(c::AbstractVector{T}, RG::GroupRing) function GroupRingElem(c::AbstractVector, RG::GroupRing)
return GroupRingElem{T}(c, RG) return GroupRingElem{eltype(c), typeof(c)}(c, RG)
end end
function GroupRing(G::Group; fastm::Bool=false) function GroupRing(G::Group; fastm::Bool=false)
@ -112,7 +118,7 @@ end
zero(RG::GroupRing, T::Type=Int) = RG(T) zero(RG::GroupRing, T::Type=Int) = RG(T)
one(RG::GroupRing, T::Type=Int) = RG(RG.group(), T) one(RG::GroupRing, T::Type=Int) = RG(RG.group(), T)
one{R<:Nemo.Ring, S<:Nemo.RingElem}(RG::GroupRing{R,S}) = RG(eye(RG.group())) one(RG::GroupRing{R}, T::Type=Int) where {R<:Nemo.Ring} = RG(one(RG.group()), T)
function (RG::GroupRing)(i::Int, T::Type=Int) function (RG::GroupRing)(i::Int, T::Type=Int)
elt = RG(T) elt = RG(T)
@ -120,9 +126,9 @@ function (RG::GroupRing)(i::Int, T::Type=Int)
return elt return elt
end end
function (RG::GroupRing{R,S}){R<:Ring, S}(i::Int, T::Type=Int) function (RG::GroupRing{R})(i::Int, T::Type=Int) where {R<:Ring}
elt = RG(T) elt = RG(T)
elt[eye(RG.group())] = i elt[one(RG.group())] = i
return elt return elt
end end