From 679166114e75a95eb1bfd7e5a1c2ebcf7398df94 Mon Sep 17 00:00:00 2001 From: kalmar Date: Wed, 17 May 2017 11:36:47 +0200 Subject: [PATCH] format --- src/GroupRings.jl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/GroupRings.jl b/src/GroupRings.jl index eb6fbc3..162f547 100644 --- a/src/GroupRings.jl +++ b/src/GroupRings.jl @@ -178,9 +178,9 @@ end function scalar_multiplication{T<:Number, S<:Number}(a::T, X::GroupRingElem{S}) - promote_type(T,S) == S || warn("Scalar and coeffs are in different rings! Promoting result to $(promote_type(T,S))") - return GroupRingElem(a*X.coeffs, parent(X)) - end + promote_type(T,S) == S || warn("Scalar and coeffs are in different rings! + Promoting result to $(promote_type(T,S))") + return GroupRingElem(a*X.coeffs, parent(X)) end (*){T<:Number}(a::T,X::GroupRingElem) = scalar_multiplication(a, X) @@ -188,10 +188,9 @@ end (/){T<:Number}(a::T, X::GroupRingElem) = scalar_multiplication(1/a, X) (//){T<:Rational, S<:Rational}(X::GroupRingElem{T}, a::S) = -GroupRingElem(X.coeffs//a, parent(X)) + GroupRingElem(X.coeffs//a, parent(X)) -(//){T<:Rational, S<:Integer}(X::GroupRingElem{T}, a::S) = -X//convert(T,a) +(//){T<:Rational, S<:Integer}(X::GroupRingElem{T}, a::S) = X//convert(T,a) ############################################################################### #