Merge pull request #91 from jmejia8/fix-issues

Fix #86 #89

Author: jmejia8

Project.toml

@@ -1,7 +1,7 @@
 name = "Metaheuristics"
 uuid = "bcdb8e00-2c21-11e9-3065-2b553b22f898"
 authors = ["Jesus Mejia <jesusmejded@gmail.com>"]
-version = "3.3.1"
+version = "3.3.2"
 
 [deps]
 Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"

src/common/compare.jl

@@ -78,7 +78,7 @@ end
 """
 function compare(a::Vector, b::Vector)
     k = length(a)
-    @assert k == length(b)
+    @assert k == length(b) "Seems that objective function returns vectors of different sizes."
 
     i = 1
     while i <= k && a[i] == b[i]

src/externals.jl

@@ -13,6 +13,7 @@ using Reexport
 
 @reexport import SearchSpaces
 @reexport import SearchSpaces: BoxConstrainedSpace, PermutationSpace, BitArraySpace
+@reexport import SearchSpaces: cardinality
 using SearchSpaces
 import SearchSpaces: AbstractSearchSpace,getdim
 import SearchSpaces: AtomicSearchSpace, AbstractSampler, Sampler

src/operators/crossover/sbx.jl

@@ -10,7 +10,7 @@ mutable struct SBX
     rng
 end
 
-SBX(;η=15, p=0.9, bounds=zeros(0,0), rng = default_rng_mh()) = SBX(η, p, bounds, rng)
+SBX(;η=15, p=0.9, bounds=zeros(0,0), rng = default_rng_mh()) = SBX(η, p, _mat_to_bounds(bounds), rng)
 
 
 function crossover(population, parameters::SBX)

src/operators/mutation/polynomial.jl

@@ -13,10 +13,10 @@ end
 function PolynomialMutation(;
         η = 15.0,
         bounds = zeros(0,0),
-        p=1/getdim(bounds),
+        p=1/getdim(_mat_to_bounds(bounds)),
         rng = default_rng_mh()
     )
-    PolynomialMutation(η, isfinite(p) ? p : 1e-2, bounds, rng)
+    PolynomialMutation(η, isfinite(p) ? p : 1e-2, _mat_to_bounds(bounds), rng)
 end
 
 function mutation!(Q, parameters::PolynomialMutation)

test/common-methods.jl

@@ -186,7 +186,8 @@ import Random: seed!
         pop1 = Metaheuristics.create_child(rand(N,D), rand(N)) 
         pop2 = Metaheuristics.create_child(rand(N,D), (rand(N), -ones(N,2), zeros(N,2))) 
 
-        problem = Metaheuristics.Problem(x -> rand(), [zeros(D)'; ones(D)'])
+        bounds = [zeros(D)'; ones(D)']
+        problem = Metaheuristics.Problem(x -> rand(), bounds)
         for pop in [pop1, pop2]
             status = State(pop[1], pop)
             X = Metaheuristics.reproduction(status, ECA(N=N,K=3).parameters, problem)
@@ -195,6 +196,9 @@ import Random: seed!
         end
 
         v = Metaheuristics.GA_reproduction_half(rand(D), rand(D), problem.bounds)
+        @test PolynomialMutation(;bounds) isa PolynomialMutation
+        @test SBX(;bounds) isa SBX
+
         @test length(v) == D
     end