Merge pull request #12 from kalmarek/fix/wlmetric_ball_serial

fix error in wlmetric_ball_serial

.travis.yml

@@ -5,10 +5,10 @@ os:
   - osx
 julia:
   - 1.3
-  - 1.4
+  - 1.5
   - nightly
 notifications:
-  email: true
+  email: false
 matrix:
   fast_finish: true
   allow_failures:

LICENSE

@@ -0,0 +1,7 @@
+Copyright 2020 Marek Kaluba
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

LICENSE.md

@@ -1,22 +0,0 @@
-The Groups.jl package is licensed under the MIT "Expat" License:
-
-> Copyright (c) 2017: kalmar.
-> 
-> Permission is hereby granted, free of charge, to any person obtaining a copy
-> of this software and associated documentation files (the "Software"), to deal
-> in the Software without restriction, including without limitation the rights
-> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-> copies of the Software, and to permit persons to whom the Software is
-> furnished to do so, subject to the following conditions:
-> 
-> The above copyright notice and this permission notice shall be included in all
-> copies or substantial portions of the Software.
-> 
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-> SOFTWARE.
-> 

Project.toml

@@ -1,7 +1,7 @@
 name = "Groups"
 uuid = "5d8bd718-bd84-11e8-3b40-ad14f4a32557"
 authors = ["Marek Kaluba <kalmar@amu.edu.pl>"]
-version = "0.5.0"
+version = "0.5.1"
 
 [deps]
 AbstractAlgebra = "c3fe647b-3220-5bb0-a1ea-a7954cac585d"

src/Groups.jl

@@ -72,7 +72,6 @@ word-length metric on the group generated by `S`. The ball is centered at `cente
 (by default: the identity element). `radius` and `op` keywords specify the
 radius and multiplication operation to be used.
 """
-
 function wlmetric_ball_serial(
     S::AbstractVector{T};
     radius = 2,
@@ -81,10 +80,7 @@ function wlmetric_ball_serial(
     old = unique!([one(first(S)), S...])
     sizes = [1, length(old)]
     for i = 2:radius
-        new = collect(
+        new = collect(op(o, s) for o in @view(old[sizes[end-1]:end]) for s in S)
-            op(i, j)
-            for (i, j) in Base.product(@view(old[sizes[end-1]:end]), S)
-        )
         append!(old, new)
         resize!(new, 0)
         old = unique!(old)

test/runtests.jl

@@ -15,6 +15,8 @@ using LinearAlgebra
       S = [w,r,s]; S = unique([S; inv.(S)]);
       _, sizes = Groups.wlmetric_ball(S, radius=4);
       @test sizes == [7, 33, 141, 561]
+      _, sizes = Groups.wlmetric_ball_serial(S, radius=4);
+      @test sizes == [7, 33, 141, 561]
    end
 
    include("FreeGroup-tests.jl")