From 6abb2c41863835c31ab34efc51cc6d2a437ff572 Mon Sep 17 00:00:00 2001
From: kalmarek <kalmar@amu.edu.pl>
Date: Mon, 20 Aug 2018 03:24:49 +0200
Subject: [PATCH] dispatch method of main is decided based on G

---
 AutFn.jl    |  6 +-----
 SLn.jl      |  6 +-----
 runtests.jl | 29 +++++++++++++++--------------
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/AutFn.jl b/AutFn.jl
index a195374..2c4841b 100644
--- a/AutFn.jl
+++ b/AutFn.jl
@@ -62,8 +62,4 @@ include("main.jl")
 
 G = PropertyTGroups.SpecialAutomorphismGroup(PARSEDARGS)
 
-if PARSEDARGS["nosymmetry"]
-    main(Standard, G)
-else
-    main(Symmetrize, G)
-end
+main(G)
diff --git a/SLn.jl b/SLn.jl
index 143e65f..c4d31fb 100644
--- a/SLn.jl
+++ b/SLn.jl
@@ -59,8 +59,4 @@ include("main.jl")
 
 G = PropertyTGroups.SpecialLinearGroup(PARSEDARGS)
 
-if PARSEDARGS["nosymmetry"]
-    main(Standard, G)
-else
-    main(Symmetrize, G)
-end
+main(G)
diff --git a/runtests.jl b/runtests.jl
index ff39cc9..fba7bc2 100644
--- a/runtests.jl
+++ b/runtests.jl
@@ -7,22 +7,22 @@ info(testdir)
 mkdir(testdir)
 cd(testdir)
 
-function SL_tests(::Type{T}, args) where {T<:Union{Standard, Symmetrize}}
+function SL_tests(args)
 
     G = PropertyTGroups.SpecialLinearGroup(args)
     args["p"] = 3
-    @test main(T, G) == true
+    @test main(G) == true
 
     println("\n"*"="^30*"\n")
 
     begin
         args["p"] = 5
         G = PropertyTGroups.SpecialLinearGroup(args)
-        @test main(T, G) == false
+        @test main(G) == false
 
         args["warmstart"] = true
         G = PropertyTGroups.SpecialLinearGroup(args)
-        @test main(T, G) == false
+        @test main(G) == false
     end
 
     println("\n"*"="^30*"\n")
@@ -30,20 +30,20 @@ function SL_tests(::Type{T}, args) where {T<:Union{Standard, Symmetrize}}
     begin
         args["p"] = 7
         G = PropertyTGroups.SpecialLinearGroup(args)
-        @test main(T, G) == false
+        @test main(G) == false
 
         println("\n"*"="^30*"\n")
 
         args["upper-bound"] = 0.25
         G = PropertyTGroups.SpecialLinearGroup(args)
-        @test main(T, G) == false
+        @test main(G) == false
     end
 
     println("\n"*"="^30*"\n")
 
     args["N"] = 3
     G = PropertyTGroups.SpecialLinearGroup(args)
-    @test main(T, G) == true
+    @test main(G) == true
 
     println("\n"*"="^30*"\n")
 
@@ -53,24 +53,25 @@ function SL_tests(::Type{T}, args) where {T<:Union{Standard, Symmetrize}}
         args["upper-bound"] = Inf
 
         G = PropertyTGroups.SpecialLinearGroup(args)
-        @test main(T, G) == false
+        @test main(G) == false
 
         args["upper-bound"] = 0.27
         args["warmstart"] = true
         G = PropertyTGroups.SpecialLinearGroup(args)
-        @test main(T, G) == false
+        @test main(G) == false
 
         G = PropertyTGroups.SpecialLinearGroup(args)
-        @test main(T, G) == true
+        @test main(G) == true
         G = PropertyTGroups.SpecialLinearGroup(args)
-        @test main(T, G) == true
+        @test main(G) == true
     end
 
-    return main(T, G)
+    return main(G)
 end
 
 @testset "SLn's" begin
 
+
     @testset "Non-Symmetrized" begin
 
         args = Dict(
@@ -86,7 +87,7 @@ end
             "nosymmetry"=>true,
         )
 
-        @time SL_tests(Standard, args)
+        SL_tests(args)
     end
 
     @testset "Symmetrized" begin
@@ -104,6 +105,6 @@ end
             "nosymmetry"=>false,
         )
 
-        @time SL_tests(Symmetrize, args)
+        SL_tests(args)
     end
 end