Refactor names for clarity

Author: aahaselgrove

src/selections.jl

@@ -1,4 +1,4 @@
-# GA seclections
+# GA selections
 # ==============
 
 # Rank-based fitness assignment
@@ -7,12 +7,24 @@ 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 = zeros(λ)
+
+        ranks = Vector{Float64}(undef, λ)
+>>>>>>> Stashed changes
         for i in 1:λ
-            ranks[i] = ( 2.0- sp + 2.0*(sp - 1.0)*(idx[i] - 1.0) / (λ - 1.0) ) / λ
+            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
@@ -21,13 +33,18 @@ end
 function uniformranking(μ::Int)
     function uniformrank(fitness::Vector{Float64}, N::Int)
         λ = length(fitness)
-        idx = sortperm(fitness, rev=true)
+<<<<<<< Updated upstream
         @assert μ < λ "μ should be less then $(λ)"
-        ranks = zeros(fitness)
-        for i in 1:μ
-            ranks[idx[i]] = 1/μ
-        end
+
+        prob = fill(1/μ, μ)
+        return pselection(prob, N)
+=======
+        @assert μ < λ "μ should equal $(λ)"
+
+        ranks = fill(1/μ, μ)
+
         return pselection(ranks, N)
+>>>>>>> Stashed changes
     end
     return uniformrank
 end
@@ -40,11 +57,13 @@ end
 
 # Stochastic universal sampling (SUS)
 function sus(fitness::Vector{Float64}, N::Int)
+    selected = Vector{Int}(undef, N)
+    
     F = sum(fitness)
     P = F/N
+    
     start = P*rand()
     pointers = [start+P*i for i = 0:(N-1)]
-    selected = Vector{Int}(undef, N)
     i = c = 1
     for P in pointers
         while sum(fitness[1:i]) < P
@@ -53,6 +72,7 @@ function sus(fitness::Vector{Float64}, N::Int)
         selected[c] = i
         c += 1
     end
+
     return selected
 end