Fixed code of ABC, DE and GWO to match the author's implementation.

UM-LPM · Aug 28, 2023 · 50b3259 · 50b3259
1 parent 51ca3ea
commit 50b3259
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/src/org/um/feri/ears/algorithms/so/abc/ABC.java b/src/org/um/feri/ears/algorithms/so/abc/ABC.java
@@ -67,13 +67,25 @@ public NumberSolution<Double> execute(Task<NumberSolution<Double>, DoubleProblem
 
     private void sendScoutBees() throws StopCriterionException {
 
-        for (int i = 0; i < foodNumber; i++) {
+        /*for (int i = 0; i < foodNumber; i++) {
             if (population.get(i).trials >= limit) {
                 if (task.isStopCriterion())
                     return;
                 ABCSolution newBee = new ABCSolution(task.getRandomEvaluatedSolution());
                 population.set(i, newBee);
             }
+        }*/
+
+        int maxtrialindex = 0;
+        for (int i = 0; i < foodNumber; i++) {
+            if(population.get(i).trials > population.get(maxtrialindex).trials)
+                maxtrialindex = i;
+        }
+        if(population.get(maxtrialindex).trials >= limit) {
+            if (task.isStopCriterion())
+                return;
+            ABCSolution newBee = new ABCSolution(task.getRandomEvaluatedSolution());
+            population.set(maxtrialindex, newBee);
         }
 
     }
@@ -108,7 +120,7 @@ private void sendOnlookerBees() throws StopCriterionException {
 
                 phi = Util.nextDouble(-1, 1);
 
-                newValue = population.get(i).getValue(param2change) + (population.get(i).getValue(param2change) - population.get(neighbour).getValue(param2change)) * (phi - 0.5) * 2;
+                newValue = population.get(i).getValue(param2change) + (population.get(i).getValue(param2change) - population.get(neighbour).getValue(param2change)) * phi;
                 newValue = task.problem.setFeasible(newValue, param2change);
 
                 ABCSolution newBee = new ABCSolution(population.get(i));
@@ -167,8 +179,7 @@ private void sendEmployedBees() throws StopCriterionException {
 
             phi = Util.nextDouble(-1, 1);
 
-            //TODO pomno�i samo z phi
-            newValue = population.get(i).getValue(param2change) + (population.get(i).getValue(param2change) - population.get(neighbour).getValue(param2change)) * (phi - 0.5) * 2;
+            newValue = population.get(i).getValue(param2change) + (population.get(i).getValue(param2change) - population.get(neighbour).getValue(param2change)) * phi;
             newValue = task.problem.setFeasible(newValue, param2change);
 
             ABCSolution newBee = new ABCSolution(population.get(i));

diff --git a/src/org/um/feri/ears/algorithms/so/de/DEAlgorithm.java b/src/org/um/feri/ears/algorithms/so/de/DEAlgorithm.java
@@ -375,7 +375,7 @@ else if (strategy == Strategy.JDE_RAND_1_BIN) {
                         CR = tmpCR;
 
                     for (L = 0; L < D; L++) /* perform D binomial trials */ {
-                        if ((Util.rnd.nextDouble() < CR) || L == (D - 1)) {
+                        if ((Util.rnd.nextDouble() < CR) || L == D) {
                             tmp[n] = pold[r1].getValue(n) + F * (pold[r2].getValue(n) - pold[r3].getValue(n));
                         }
                         n = (n + 1) % D;

diff --git a/src/org/um/feri/ears/algorithms/so/gwo/GWO.java b/src/org/um/feri/ears/algorithms/so/gwo/GWO.java
@@ -99,8 +99,7 @@ public NumberSolution<Double> execute(Task<NumberSolution<Double>, DoubleProblem
                 NumberSolution<Double> newWolf = new NumberSolution<>(Util.toDoubleArrayList(newPosition));
                 task.eval(newWolf);
 
-                if (task.problem.isFirstBetter(newWolf, population.get(index)))
-                    population.set(index, newWolf);
+                population.set(index, newWolf);
             }
             updateABD();
             task.incrementNumberOfIterations();