mirror of
https://github.com/kalmarek/GroupRings.jl.git
synced 2024-09-05 14:46:44 +02:00
group_star_multiplication -> groupring_mult
This commit is contained in:
parent
04ee0ac659
commit
890bde8b82
@ -241,19 +241,23 @@ function groupring_mult(X::AbstractVector, Y::AbstractVector, pm::Array{Int,2})
|
|||||||
return groupring_mult!(X,Y,pm,result)
|
return groupring_mult!(X,Y,pm,result)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function groupring_mult{T<:Number}(X::GroupRingElem{T}, Y::GroupRingElem{T})
|
||||||
parent(X) == parent(Y) || throw(ArgumentError(
|
parent(X) == parent(Y) || throw(ArgumentError(
|
||||||
"Elements don't seem to belong to the same Group Algebra!"))
|
"Elements don't seem to belong to the same Group Algebra!"))
|
||||||
result = algebra_multiplication(X.coeffs, Y.coeffs, X.pm)
|
result = groupring_mult(X.coeffs, Y.coeffs, parent(X).pm)
|
||||||
return GroupRingElem(result, parent(X))
|
return GroupRingElem(result, parent(X))
|
||||||
end
|
end
|
||||||
|
|
||||||
function group_star_multiplication{T<:Number, S<:Number}(
|
function groupring_mult{T<:Number, S<:Number}(X::GroupRingElem{T},
|
||||||
X::GroupRingElem{T}, Y::GroupRingElem{S})
|
Y::GroupRingElem{S})
|
||||||
|
parent(X) == parent(Y) || throw("Elements don't seem to belong to the same
|
||||||
|
Group Ring!")
|
||||||
warn("Multiplying elements with different base rings!")
|
warn("Multiplying elements with different base rings!")
|
||||||
return group_star_multiplication(promote(X,Y)...)
|
result = groupring_mult(promote(X.coeffs,Y.coeffs)..., parent(X).pm)
|
||||||
|
return GroupRingElem(result, parent(X))
|
||||||
end
|
end
|
||||||
|
|
||||||
(*)(X::GroupRingElem, Y::GroupRingElem) = group_star_multiplication(X,Y)
|
(*)(X::GroupRingElem, Y::GroupRingElem) = groupring_mult(X,Y)
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user