Project.toml

@@ -1,7 +1,7 @@
 name = "Groups"
 uuid = "5d8bd718-bd84-11e8-3b40-ad14f4a32557"
 authors = ["Marek Kaluba <kalmar@amu.edu.pl>"]
-version = "0.7.8"
+version = "0.7.7"
 
 [deps]
 GroupsCore = "d5909c97-4eac-4ecc-a3dc-fdd0858a4120"
@@ -17,7 +17,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 GroupsCore = "0.4"
 KnuthBendix = "0.4"
 OrderedCollections = "1"
-PermutationGroups = "0.4"
+PermutationGroups = "0.3"
 StaticArrays = "1"
 julia = "1.6"
 

src/constructions/wreath_product.jl

@@ -1,7 +1,5 @@
 import PermutationGroups:
-    AbstractPermutationGroup,
-    AbstractPermutation,
-    degree
+    AbstractPermutationGroup, AbstractPerm, degree, SymmetricGroup
 
 """
     WreathProduct(G::Group, P::AbstractPermutationGroup) <: Group
@@ -29,7 +27,7 @@ end
 
 struct WreathProductElement{
     DPEl<:DirectPowerElement,
-    PEl<:AbstractPermutation,
+    PEl<:AbstractPerm,
     Wr<:WreathProduct,
 } <: GroupsCore.GroupElement
     n::DPEl
@@ -38,7 +36,7 @@ struct WreathProductElement{
 
     function WreathProductElement(
         n::DirectPowerElement,
-        p::AbstractPermutation,
+        p::AbstractPerm,
         W::WreathProduct,
     )
         return new{typeof(n),typeof(p),typeof(W)}(n, p, W)
@@ -55,19 +53,16 @@ function Base.iterate(G::WreathProduct)
     itr = Iterators.product(G.N, G.P)
     res = iterate(itr)
     @assert res !== nothing
-    ab, st = res
-    (a, b) = ab
-    elt = WreathProductElement(a, b, G)
-    return elt, (itr, st)
+    elt = WreathProductElement(first(res)..., G)
+    return elt, (iterator = itr, state = last(res))
 end
 
 function Base.iterate(G::WreathProduct, state)
-    itr, st = state
+    itr, st = state.iterator, state.state
     res = iterate(itr, st)
     res === nothing && return nothing
-    (a::eltype(G.N), b::eltype(G.P)), st = res
-    elt = WreathProductElement(a, b, G)
-    return elt, (itr, st)
+    elt = WreathProductElement(first(res)..., G)
+    return elt, (iterator = itr, state = last(res))
 end
 
 function Base.IteratorSize(::Type{<:WreathProduct{DP,PGr}}) where {DP,PGr}
@@ -123,11 +118,8 @@ function Base.deepcopy_internal(g::WreathProductElement, stackdict::IdDict)
     )
 end
 
-function _act(p::AbstractPermutation, n::DirectPowerElement)
-    return DirectPowerElement(
-        ntuple(i -> n.elts[i^p], length(n.elts)),
-        parent(n),
-    )
+function _act(p::AbstractPerm, n::DirectPowerElement)
+    return DirectPowerElement(n.elts^p, parent(n))
 end
 
 function Base.inv(g::WreathProductElement)

test/AutSigma3.jl

@@ -5,7 +5,7 @@
 
     @test contains(sprint(print, π₁Σ), "surface")
 
-    Groups.PermRightAut(p::Perm) = Groups.PermRightAut([i^p for i in 1:2genus])
+    Groups.PermRightAut(p::Perm) = Groups.PermRightAut(p.d)
     # Groups.PermLeftAut(p::Perm) = Groups.PermLeftAut(p.d)
     autπ₁Σ = let autπ₁Σ = AutomorphismGroup(π₁Σ)
         pauts = let p = perm"(1,3,5)(2,4,6)"
@@ -50,9 +50,8 @@
     @test π₁Σ.(word.(z)) == Groups.domain(first(S))
     d = Groups.domain(first(S))
     p = perm"(1,3,5)(2,4,6)"
-    @test Groups.evaluate!(deepcopy(d), τ) ==
-          ntuple(i -> d[i^inv(p)], length(d))
-    @test Groups.evaluate!(deepcopy(d), τ^2) == ntuple(i -> d[i^p], length(d))
+    @test Groups.evaluate!(deepcopy(d), τ) == d^inv(p)
+    @test Groups.evaluate!(deepcopy(d), τ^2) == d^p
 
     E, sizes = Groups.wlmetric_ball(S, radius=3)
     @test sizes == [49, 1813, 62971]

test/group_constructions.jl

@@ -1,10 +1,9 @@
 @testset "GroupConstructions" begin
 
-    symmetric_group(n) = PermGroup(perm"(1,2)", Perm([2:n; 1]))
-
     @testset "DirectProduct" begin
         GH =
-            let G = symmetric_group(3), H = symmetric_group(4)
+            let G = PermutationGroups.SymmetricGroup(3),
+                H = PermutationGroups.SymmetricGroup(4)
 
                 Groups.Constructions.DirectProduct(G, H)
             end
@@ -18,7 +17,7 @@
 
     @testset "DirectPower" begin
         GGG = Groups.Constructions.DirectPower{3}(
-            symmetric_group(3),
+            PermutationGroups.SymmetricGroup(3),
         )
         test_Group_interface(GGG)
         test_GroupElement_interface(rand(GGG, 2)...)
@@ -29,7 +28,8 @@
     end
     @testset "WreathProduct" begin
         W =
-            let G = symmetric_group(2), P = symmetric_group(4)
+            let G = PermutationGroups.SymmetricGroup(2),
+                P = PermutationGroups.SymmetricGroup(4)
 
                 Groups.Constructions.WreathProduct(G, P)
             end