From 12a93e804dde4de8ecdcb736b3be29886fae6138 Mon Sep 17 00:00:00 2001
From: Andrew Haselgrove <aahaselgrove@gmail.com>
Date: Mon, 30 Sep 2019 16:51:21 +1000
Subject: [PATCH] Simplify uniformranking

---
 src/Evolutionary.jl |  2 +-
 src/selections.jl   | 33 +++++----------------------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/src/Evolutionary.jl b/src/Evolutionary.jl
index d1abf5a..91f0810 100644
--- a/src/Evolutionary.jl
+++ b/src/Evolutionary.jl
@@ -12,7 +12,7 @@ using Random
            discrete, waverage, intermediate, line,
            pmx, ox1, cx, ox2, pos,
            # GA selections
-           ranklinear, uniformranking, roulette, sus, tournament, #truncation
+           ranklinear, rankuniform, roulette, sus, tournament, #truncation
            # Optimization methods
            es, cmaes, ga
 
diff --git a/src/selections.jl b/src/selections.jl
index da72a29..0378ef4 100644
--- a/src/selections.jl
+++ b/src/selections.jl
@@ -7,46 +7,23 @@ function ranklinear(sp::Float64)
     @assert 1.0 <= sp <= 2.0 "Selective pressure has to be in range [1.0, 2.0]."
     function rank(fitness::Vector{Float64}, N::Int)
         λ = length(fitness)
-<<<<<<< Updated upstream
         rank = sortperm(fitness)
         
         prob = Vector{Float64}(undef, λ)
-=======
-        idx = sortperm(fitness)
-
-        ranks = Vector{Float64}(undef, λ)
->>>>>>> Stashed changes
         for i in 1:λ
             prob[i] = ( 2.0- sp + 2.0*(sp - 1.0)*(rank[i] - 1.0) / (λ - 1.0) ) / λ
         end
 
-<<<<<<< Updated upstream
         return pselection(prob, N)
-=======
-        return pselection(ranks, N)
->>>>>>> Stashed changes
     end
     return rank
 end
 
-# (μ, λ)-uniform ranking selection
-function uniformranking(μ::Int)
-    function uniformrank(fitness::Vector{Float64}, N::Int)
-        λ = length(fitness)
-<<<<<<< Updated upstream
-        @assert μ < λ "μ should be less then $(λ)"
-
-        prob = fill(1/μ, μ)
-        return pselection(prob, N)
-=======
-        @assert μ < λ "μ should equal $(λ)"
-
-        ranks = fill(1/μ, μ)
-
-        return pselection(ranks, N)
->>>>>>> Stashed changes
-    end
-    return uniformrank
+# uniform ranking selection
+function rankuniform(fitness::Vector{Float64}, N::Int)
+    μ = length(fitness)
+    prob = fill(1/μ, μ)
+    return pselection(prob, N)
 end
 
 # Roulette wheel (proportionate selection) selection