From 81e08eb8575b329ee7ced28193ee0b1642c6e622 Mon Sep 17 00:00:00 2001
From: kalmarek <kalmar@amu.edu.pl>
Date: Tue, 31 Jul 2018 10:21:54 +0200
Subject: [PATCH] migrate to AbstractAlgebra

---
 REQUIRE                   |  5 +++--
 src/Orbit-wise.jl         |  2 +-
 src/OrbitDecomposition.jl | 10 +++++-----
 src/PropertyT.jl          |  4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/REQUIRE b/REQUIRE
index 7026f54..7e3c8b8 100644
--- a/REQUIRE
+++ b/REQUIRE
@@ -1,9 +1,10 @@
 julia
 JuMP 0.18.0
 SCS
-IntervalArithmetic 
+IntervalArithmetic
 JLD
 Memento
-Nemo 0.7.9-
+Nemo
+AbstractAlgebra
 Groups
 GroupRings
diff --git a/src/Orbit-wise.jl b/src/Orbit-wise.jl
index 00bfa0f..c3a34a8 100644
--- a/src/Orbit-wise.jl
+++ b/src/Orbit-wise.jl
@@ -204,7 +204,7 @@ function λandP(m::JuMP.Model, data::OrbitData, sett::Settings)
     return λ, recP
 end
 
-function load_preps(fname::String, G::Nemo.Group)
+function load_preps(fname::String, G::Group)
     lded_preps = load(fname, "perms_d")
     permG = PermutationGroup(length(first(lded_preps)))
     @assert length(lded_preps) == order(G)
diff --git a/src/OrbitDecomposition.jl b/src/OrbitDecomposition.jl
index 7ae3c4b..d1d4b13 100644
--- a/src/OrbitDecomposition.jl
+++ b/src/OrbitDecomposition.jl
@@ -6,7 +6,7 @@ include("Projections.jl")
 #
 ###############################################################################
 
-function orbit_decomposition(G::Nemo.Group, E::Vector, rdict=GroupRings.reverse_dict(E))
+function orbit_decomposition(G::Group, E::Vector, rdict=GroupRings.reverse_dict(E))
 
     elts = collect(elements(G))
 
@@ -82,9 +82,9 @@ end
 function perm_reps(G::Group, E::Vector, E_rdict=GroupRings.reverse_dict(E))
     elts = collect(elements(G))
     l = length(elts)
-    preps = Vector{Generic.perm}(l)
+    preps = Vector{perm}(l)
 
-    permG = Nemo.PermutationGroup(length(E))
+    permG = PermutationGroup(length(E))
 
     Threads.@threads for i in 1:l
         preps[i] = permG(PropertyT.perm_repr(elts[i], E, E_rdict))
@@ -128,14 +128,14 @@ function orthSVD{T}(M::AbstractMatrix{T})
     return fact[:U][:,1:M_rank]
 end
 
-function compute_orbit_data{T<:GroupElem}(logger, name::String, S::Vector{T}, autS::Nemo.Group; radius=2)
+function compute_orbit_data{T<:GroupElem}(logger, name::String, S::Vector{T}, autS::Group; radius=2)
     isdir(name) || mkdir(name)
 
     info(logger, "Generating ball of radius $(2*radius)")
 
     # TODO: Fix that by multiple dispatch?
     G = parent(first(S))
-    Id = (isa(G, Nemo.Ring) ? one(G) : G())
+    Id = (isa(G, Ring) ? one(G) : G())
 
     @logtime logger E_2R, sizes = Groups.generate_balls(S, Id, radius=2*radius);
     info(logger, "Balls of sizes $sizes.")
diff --git a/src/PropertyT.jl b/src/PropertyT.jl
index fe21b6f..640c617 100644
--- a/src/PropertyT.jl
+++ b/src/PropertyT.jl
@@ -1,10 +1,10 @@
 module PropertyT
 
-using Nemo
+using AbstractAlgebra
 using Groups
 using GroupRings
 
-import Nemo: Group, GroupElem, Ring, Generic.perm
+import AbstractAlgebra: Group, GroupElem, Ring, perm
 
 using JLD
 using JuMP