more or less trivial changes
This commit is contained in:
parent
558cbc78d8
commit
04f29f0b34
|
|
@ -0,0 +1,58 @@
|
|||
[[AbstractAlgebra]]
|
||||
deps = ["InteractiveUtils", "LinearAlgebra", "Markdown", "Random", "SparseArrays", "Test"]
|
||||
git-tree-sha1 = "9163ee4ff00b442021ffcda1b6c1b43ced6750fb"
|
||||
repo-rev = "master"
|
||||
repo-url = "AbstractAlgebra"
|
||||
uuid = "c3fe647b-3220-5bb0-a1ea-a7954cac585d"
|
||||
version = "0.1.2+"
|
||||
|
||||
[[Base64]]
|
||||
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
|
||||
|
||||
[[Distributed]]
|
||||
deps = ["LinearAlgebra", "Random", "Serialization", "Sockets"]
|
||||
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
|
||||
|
||||
[[Groups]]
|
||||
deps = ["AbstractAlgebra", "LinearAlgebra", "Markdown", "Test"]
|
||||
git-tree-sha1 = "ba3f1e4a34adb71f3b7780371a565703c595ef29"
|
||||
repo-rev = "enh/julia-v0.7"
|
||||
repo-url = "Groups"
|
||||
uuid = "5d8bd718-bd84-11e8-3b40-ad14f4a32557"
|
||||
version = "0.1.0"
|
||||
|
||||
[[InteractiveUtils]]
|
||||
deps = ["LinearAlgebra", "Markdown"]
|
||||
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
|
||||
|
||||
[[Libdl]]
|
||||
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
|
||||
|
||||
[[LinearAlgebra]]
|
||||
deps = ["Libdl"]
|
||||
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
|
||||
|
||||
[[Logging]]
|
||||
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
|
||||
|
||||
[[Markdown]]
|
||||
deps = ["Base64"]
|
||||
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
|
||||
|
||||
[[Random]]
|
||||
deps = ["Serialization"]
|
||||
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
|
||||
|
||||
[[Serialization]]
|
||||
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
|
||||
|
||||
[[Sockets]]
|
||||
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
|
||||
|
||||
[[SparseArrays]]
|
||||
deps = ["LinearAlgebra", "Random"]
|
||||
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
|
||||
|
||||
[[Test]]
|
||||
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
|
||||
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
name = "GroupRings"
|
||||
uuid = "0befed6a-bd73-11e8-1e41-a1190947c2f5"
|
||||
authors = ["Marek Kaluba <kalmar@amu.edu.pl>"]
|
||||
version = "0.1.0"
|
||||
|
||||
[deps]
|
||||
AbstractAlgebra = "c3fe647b-3220-5bb0-a1ea-a7954cac585d"
|
||||
Groups = "5d8bd718-bd84-11e8-3b40-ad14f4a32557"
|
||||
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
|
||||
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
|
||||
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
|
||||
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
|
||||
|
|
@ -2,9 +2,15 @@ __precompile__()
|
|||
module GroupRings
|
||||
|
||||
using AbstractAlgebra
|
||||
import AbstractAlgebra: Group, GroupElem, Ring, RingElem, parent, elem_type, parent_type, mul!, addeq!, divexact
|
||||
import AbstractAlgebra: Group, GroupElem, Ring, RingElem, parent, elem_type, parent_type, addeq!, mul!
|
||||
|
||||
import Base: convert, show, hash, ==, +, -, *, //, /, length, norm, deepcopy_internal, getindex, setindex!, eltype, one, zero
|
||||
using SparseArrays
|
||||
import SparseArrays: sparse
|
||||
using LinearAlgebra
|
||||
import LinearAlgebra: norm
|
||||
using Markdown
|
||||
|
||||
import Base: convert, show, hash, ==, +, -, *, //, /, length, getindex, setindex!, eltype, one, zero
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
|
|
@ -215,8 +221,8 @@ function Base.full(X::GroupRingElem{T, Sp}) where {T, Sp<:SparseVector}
|
|||
end
|
||||
Base.full(X::GroupRingElem{T, A}) where {T, A<:Vector} = X
|
||||
|
||||
Base.sparse(X::GroupRingElem{T, Sp}) where {T, Sp<:SparseVector} = X
|
||||
function Base.sparse(X::GroupRingElem{T, A}) where {T, A<:Vector}
|
||||
sparse(X::GroupRingElem{T, Sp}) where {T, Sp<:SparseVector} = X
|
||||
function sparse(X::GroupRingElem{T, A}) where {T, A<:Vector}
|
||||
return parent(X)(sparse(X.coeffs))
|
||||
end
|
||||
|
||||
|
|
@ -236,8 +242,8 @@ function show(io::IO, X::GroupRingElem)
|
|||
T = eltype(X.coeffs)
|
||||
print(io, "$(zero(T))*$((RG.group)())")
|
||||
elseif isdefined(RG, :basis)
|
||||
non_zeros = ((X.coeffs[i], RG.basis[i]) for i in findn(X.coeffs))
|
||||
elts = ("$(sign(c)> 0? " + ": " - ")$(abs(c))*$g" for (c,g) in non_zeros)
|
||||
non_zeros = ((X.coeffs[i], RG.basis[i]) for i in findall(!iszero, X.coeffs))
|
||||
elts = ("$(sign(c)> 0 ? " + " : " - ")$(abs(c))*$g" for (c,g) in non_zeros)
|
||||
str = join(elts, "")[2:end]
|
||||
if sign(first(non_zeros)[1]) > 0
|
||||
str = str[3:end]
|
||||
|
|
@ -337,7 +343,7 @@ function -(X::GroupRingElem{S}, Y::GroupRingElem{T}) where {S, T}
|
|||
addeq!((-Y), X)
|
||||
end
|
||||
|
||||
doc"""
|
||||
@doc doc"""
|
||||
mul!(result::AbstractArray{T},
|
||||
X::AbstractVector,
|
||||
Y::AbstractVector,
|
||||
|
|
@ -373,8 +379,8 @@ function mul!(result::AbstractVector{T},
|
|||
return result
|
||||
end
|
||||
|
||||
doc"""
|
||||
mul!{T}(result::GroupRingElem{T},
|
||||
@doc doc"""
|
||||
mul!(result::GroupRingElem{T},
|
||||
X::GroupRingElem,
|
||||
Y::GroupRingElem)
|
||||
> In-place multiplication for `GroupRingElem`s `X` and `Y`.
|
||||
|
|
@ -384,11 +390,11 @@ doc"""
|
|||
> The method will fail with `KeyError` if product `X*Y` is not supported on
|
||||
> `parent(X).basis`.
|
||||
"""
|
||||
function mul!{T}(result::GroupRingElem{T}, X::GroupRingElem, Y::GroupRingElem)
|
||||
function mul!(result::GroupRingElem, X::GroupRingElem, Y::GroupRingElem)
|
||||
if result === X
|
||||
result = deepcopy(result)
|
||||
end
|
||||
|
||||
T = eltype(result.coeffs)
|
||||
z = zero(T)
|
||||
result.coeffs .= z
|
||||
|
||||
|
|
@ -399,8 +405,10 @@ function mul!{T}(result::GroupRingElem{T}, X::GroupRingElem, Y::GroupRingElem)
|
|||
|
||||
if isdefined(RG, :pm)
|
||||
s = size(RG.pm)
|
||||
findlast(X.coeffs) <= s[1] || throw("Element in X outside of support of RG.pm")
|
||||
findlast(Y.coeffs) <= s[2] || throw("Element in Y outside of support of RG.pm")
|
||||
k = findprev(!iszero, X.coeffs, lX)
|
||||
(k == nothing ? 0 : k) <= s[1] || throw("Element in X outside of support of RG.pm")
|
||||
k = findprev(!iszero, Y.coeffs, lY)
|
||||
(k == nothing ? 0 : k) <= s[2] || throw("Element in Y outside of support of RG.pm")
|
||||
|
||||
for j in 1:lY
|
||||
if Y.coeffs[j] != z
|
||||
|
|
@ -487,13 +495,13 @@ end
|
|||
#
|
||||
###############################################################################
|
||||
|
||||
length(X::GroupRingElem) = countnz(X.coeffs)
|
||||
length(X::GroupRingElem) = count(!iszero, X.coeffs)
|
||||
|
||||
norm(X::GroupRingElem, p=2) = norm(X.coeffs, p)
|
||||
|
||||
aug(X::GroupRingElem) = sum(X.coeffs)
|
||||
|
||||
supp(X::GroupRingElem) = parent(X).basis[findn(X.coeffs)]
|
||||
supp(X::GroupRingElem) = parent(X).basis[findall(!iszero, X.coeffs)]
|
||||
|
||||
function reverse_dict(::Type{I}, iter) where I<:Integer
|
||||
length(iter) > typemax(I) && error("Can not produce reverse dict: $(length(iter)) is too large for $T")
|
||||
|
|
@ -502,8 +510,8 @@ end
|
|||
|
||||
reverse_dict(iter) = reverse_dict(Int, iter)
|
||||
|
||||
function create_pm{T<:GroupElem}(basis::Vector{T}, basis_dict::Dict{T, Int},
|
||||
limit::Int=length(basis); twisted::Bool=false, check=true)
|
||||
function create_pm(basis::Vector{T}, basis_dict::Dict{T, Int},
|
||||
limit::Int=length(basis); twisted::Bool=false, check=true) where {T<:GroupElem}
|
||||
product_matrix = zeros(Int, (limit,limit))
|
||||
Threads.@threads for i in 1:limit
|
||||
x = basis[i]
|
||||
|
|
@ -520,11 +528,13 @@ function create_pm{T<:GroupElem}(basis::Vector{T}, basis_dict::Dict{T, Int},
|
|||
return product_matrix
|
||||
end
|
||||
|
||||
function check_pm(product_matrix, basis, twisted)
|
||||
create_pm(b::Vector{T}) where {T<:GroupElem} = create_pm(b, reverse_dict(b))
|
||||
|
||||
function check_pm(product_matrix, basis, twisted=false)
|
||||
idx = findfirst(product_matrix' .== 0)
|
||||
if idx != 0
|
||||
if idx != nothing
|
||||
warn("Product is not supported on basis")
|
||||
i,j = ind2sub(product_matrix, idx)
|
||||
i,j = Tuple(idx)
|
||||
x = basis[i]
|
||||
if twisted
|
||||
x = inv(x)
|
||||
|
|
@ -534,15 +544,13 @@ function check_pm(product_matrix, basis, twisted)
|
|||
return true
|
||||
end
|
||||
|
||||
create_pm{T<:GroupElem}(b::Vector{T}) = create_pm(b, reverse_dict(b))
|
||||
|
||||
function complete!(RG::GroupRing)
|
||||
isdefined(RG, :basis) || throw(ArgumentError("Provide basis for completion first!"))
|
||||
fastm!(RG, fill=false)
|
||||
|
||||
warning = false
|
||||
for linidx in find(RG.pm .== 0)
|
||||
i,j = ind2sub(size(RG.pm), linidx)
|
||||
for idx in findall(RG.pm .== 0)
|
||||
i,j = Tuple(idx)
|
||||
g = RG.basis[i]*RG.basis[j]
|
||||
if haskey(RG.basis_dict, g)
|
||||
RG.pm[i,j] = RG.basis_dict[g]
|
||||
|
|
|
|||
Loading…
Reference in New Issue