From e39a1c8b4d0f20c172367e0b0db1444339b7ca37 Mon Sep 17 00:00:00 2001
From: kalmarek <kalmar@amu.edu.pl>
Date: Wed, 9 Jan 2019 16:53:44 +0100
Subject: [PATCH] replace fastm keyword by cachedmul

---
 src/GroupRings.jl | 22 +++++++++++++---------
 test/runtests.jl  | 12 ++++++------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/GroupRings.jl b/src/GroupRings.jl
index 2cd2464..d5ef8d5 100644
--- a/src/GroupRings.jl
+++ b/src/GroupRings.jl
@@ -22,9 +22,10 @@ mutable struct GroupRing{Gr<:Group, T<:GroupElem} <: Ring
    basis_dict::Dict{T, Int}
    pm::Array{Int,2}
 
-   function GroupRing(G::Gr, basis::Vector{T}; fastm::Bool=false) where {Gr, T}
+   function GroupRing(G::Gr, basis::Vector{T};
+         cachedmul::Bool=false) where {Gr, T}
       RG = new{Gr, T}(G, basis, reverse_dict(basis))
-      fastm && fastm!(RG)
+      cachedmul && initializepm!(RG)
       return RG
    end
 
@@ -69,8 +70,8 @@ function GroupRingElem(c::AbstractVector, RG::GroupRing)
    return GroupRingElem{eltype(c), typeof(c), typeof(RG)}(c, RG)
 end
 
-function GroupRing(G::Generic.PermGroup; fastm::Bool=false)
-   return GroupRing(G, vec(collect(G)), fastm=fastm)
+function GroupRing(G::Generic.PermGroup; cachedmul::Bool=false)
+   return GroupRing(G, vec(collect(G)), cachedmul=cachedmul)
 end
 
 function GroupRing(G::Group, basis::Vector, pm::Array{Int,2})
@@ -272,9 +273,9 @@ end
 
 function (==)(A::GroupRing, B::GroupRing)
    A.group == B.group || return false
-   if isdefined(A, :pm) && isdefined(B, :pm)
-      complete!(A)
-      complete!(B)
+   if isdefined(A, :basis) && isdefined(B, :basis)
+      A.basis == B.basis || return false
+   elseif isdefined(A, :pm) && isdefined(B, :pm)
       A.pm == B.pm || return false
    end
    return true
@@ -564,7 +565,10 @@ end
 
 function complete!(RG::GroupRing)
    isdefined(RG, :basis) || throw(ArgumentError("Provide basis for completion first!"))
-   fastm!(RG, fill=false)
+   if !isdefined(RG, :pm) 
+      initializepm!(RG, fill=false)
+      return RG
+   end
 
    warning = false
    for idx in findall(RG.pm .== 0)
@@ -582,7 +586,7 @@ function complete!(RG::GroupRing)
    return RG
 end
 
-function fastm!(RG::GroupRing; fill::Bool=false)
+function initializepm!(RG::GroupRing; fill::Bool=false)
    isdefined(RG, :basis) || throw("For baseless Group Rings You need to provide pm.")
    isdefined(RG, :pm) && return RG
    if fill
diff --git a/test/runtests.jl b/test/runtests.jl
index edeb3e7..64c0818 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -20,13 +20,13 @@ using SparseArrays
 
       @test isa(GroupRing(PermutationGroup(6), rand(1:6, 6,6)), GroupRing)
 
-      RG = GroupRing(G, fastm=true)
+      RG = GroupRing(G, cachedmul=true)
       @test isdefined(RG, :pm) == true
       @test RG.pm == zeros(Int, (6,6))
 
       @test isa(complete!(RG), GroupRing)
       @test all(RG.pm .> 0)
-      @test RG.pm == GroupRings.fastm!(GroupRing(G, fastm=false), fill=true).pm
+      @test RG.pm == GroupRings.initializepm!(GroupRing(G, cachedmul=false), fill=true).pm
 
       @test RG.basis_dict == GroupRings.reverse_dict(collect(G))
 
@@ -80,7 +80,7 @@ using SparseArrays
 
    @testset "GroupRingElems constructors/basic manipulation" begin
       G = PermutationGroup(3)
-      RG = GroupRing(G, fastm=true)
+      RG = GroupRing(G, cachedmul=true)
       a = rand(6)
       @test isa(GroupRingElem(a, RG), GroupRingElem)
       @test isa(RG(a), GroupRingElem)
@@ -119,7 +119,7 @@ using SparseArrays
 
    @testset "Arithmetic" begin
       G = PermutationGroup(3)
-      RG = GroupRing(G, fastm=true)
+      RG = GroupRing(G, cachedmul=true)
       a = RG(ones(Int, order(G)))
 
       @testset "scalar operators" begin
@@ -214,8 +214,8 @@ using SparseArrays
       @testset "HPC multiplicative operations" begin
       
          G = PermutationGroup(5)
-         RG = GroupRing(G, fastm=true)
-         RG2 = GroupRing(G, fastm=false)
+         RG = GroupRing(G, cachedmul=true)
+         RG2 = GroupRing(G, cachedmul=false)
          
          Z = RG()
          W = RG()