Simplified GA for ISB added

Signed-off-by: facaraff <[email protected]>

Author: facaraff

src/algorithms/specialOptions/BIAS/CMAESISB.java renamed to src/algorithms/specialOptions/BIAS/CMAES.java

@@ -51,7 +51,7 @@
 /*
  * Covariance Matrix Adaptation Evolutionary Strategy 
  */
-public class CMAESISB extends AlgorithmBias
+public class CMAES extends AlgorithmBias
 {
 
 
@@ -65,8 +65,8 @@ public class CMAESISB extends AlgorithmBias
 
 	public void setCorrectionStrategy(char c) {this.setCorrection(c);}
 
-	public CMAESISB() {super();}
-	public CMAESISB(char c) {super(); this.correction = c;}
+	public CMAES() {super();}
+	public CMAES(char c) {super(); this.correction = c;}
 
 
 

src/algorithms/specialOptions/BIAS/ISBDE/DE.java renamed to src/algorithms/specialOptions/BIAS/DE.java

@@ -26,7 +26,7 @@
 of the authors and should not be interpreted as representing official policies, 
 either expressed or implied, of the FreeBSD Project.
 */
-package algorithms.specialOptions.BIAS.ISBDE;
+package algorithms.specialOptions.BIAS;
 
 import utils.random.RandUtilsISB;
 
@@ -42,9 +42,6 @@
 import static utils.algorithms.operators.ISBOp.crossOverExp;
 import static utils.algorithms.operators.ISBOp.crossOverBin;
 
-
-
-
 import interfaces.AlgorithmBias;
 import interfaces.Problem;
 import utils.MatLab;
@@ -93,15 +90,15 @@ public FTrend execute(Problem problem, int maxEvaluations) throws Exception
 		int i = 0;
 
 
-		String FullName = getFullName("DE"+this.mutationStrategy+this.crossoverStrategy+this.correction,problem); 
+		String FullName = getFullName("DE"+this.mutationStrategy+this.crossoverStrategy+this.correction+"p"+populationSize,problem); 
 		Counter PRNGCounter = new Counter(0);
 		createFile(FullName);
 
 		int[] ids = new int[populationSize]; //int prevID = -1;
 		int newID = 0;
 		int bestID = -1;
 
-		writeHeader(" pop "+populationSize+" F "+F+" CR "+CR, problem);
+		writeHeader(" pop "+populationSize+" F "+F+" CR "+CR+" alpha "+alpha, problem);
 
 		String line = new String();
 
@@ -218,37 +215,37 @@ else if(this.mutationStrategy.equals("bo") || this.mutationStrategy.equals("bt")
 				{
 					case "ro":
 						// DE/rand/1
-//						newPt = rand1(population, F, PRNGCounter);
 						newPt = rand1(population[r1], population[r2],  population[r3], F, PRNGCounter);
 						s += ids[r2]+" "+ids[r3]+" "+ids[r1];
 						break;
 					case "ctbo":
 						// DE/cur-to-best/1
-//						newPt = currentToBest1(population, best, j, F, PRNGCounter);
 						newPt = currentToBest1(currPt, population[indexBest], population[r1], population[r2], F, PRNGCounter);
 						s += ids[j]+" "+ids[indexBest]+" "+ids[r1]+" "+ids[r2];
 						break;
 					case "rt":
 						// DE/rand/2
-						newPt = rand2(population, F, PRNGCounter);
+						newPt = rand2(population[r1], population[r2], population[r3], population[r4], population[r5],  F, PRNGCounter);
+						s+= ids[r1]+" "+ids[r2]+" "+ids[r3]+" "+ids[r4]+" "+ids[r5];
 						break;
 					case "ctro":
 						// DE/current-to-rand/1
-						crossPt = currentToRand1(population, j, F,PRNGCounter);
+						crossPt = currentToRand1(population[r1], population[r2],  population[r3], currPt, F, PRNGCounter);
+						s += ids[j]+" "+ids[r1]+" "+ids[r2]+" "+ids[r3];
 						break;
 					case "rtbt":
 						// DE/rand-to-best/2
 						newPt = randToBest2(population, best, F, PRNGCounter);
 						break;
 					case "bo":
 						// DE/best/1
-//						newPt = best1(population, best, F, PRNGCounter);
 						newPt = best1(population[indexBest], population[r1], population[r2], F, PRNGCounter);
 						 s+= ids[indexBest]+" "+ids[r1]+" "+ids[r2];
 						break;
 					case "bt":
 						// DE/best/2
-						newPt = best2(population, best, F, PRNGCounter);
+						newPt =  best2(population[indexBest], population[r1], population[r2], population[r3], population[r4], F, PRNGCounter);
+						s+= ids[indexBest]+" "+ids[r1]+" "+ids[r2]+" "+ids[r3]+" "+ids[r4];
 						break;
 					default:
 						break;
@@ -277,13 +274,12 @@ else if (crossoverStrategy == 'x')
 				{
 					for (int n = 0; n < problemDimension; n++)
 						temp[j][n] = crossPt[n];
-//						newPop[j][n] = crossPt[n];
+
 					fitnesses[j] = crossFit;
 
 					temp2[j] = crossFit;
 					idsTemp[j] = newID;
 
-					//line =""+newID+" "+ids[r2]+" "+ids[r3]+" "+ids[indexBest]+" "+formatter(fitnesses[j])+" "+i+" "+ids[j];
 					line =""+newID+" "+s+" "+formatter(fitnesses[j])+" "+i+" "+ids[j];
 					for(int n = 0; n < problemDimension; n++)
 						line+=" "+formatter(population[j][n]);
@@ -324,7 +320,6 @@ else if (crossoverStrategy == 'x')
 			idsTemp=null;
 
 		}
-
 
 		closeAll();	
 		writeStats(FullName, (double) this.numberOfCorrections/maxEvaluations, PRNGCounter.getCounter(), "correctionsDE");

src/algorithms/specialOptions/BIAS/GAPaper2.java

@@ -238,7 +238,7 @@ else if(xover=='a')// WHOLE ARITHMETIC RECOMBINATION
 
 			}
 		else
-			System.out.println("FUCK OFF, NO ADMISSIBLE OXVER SELECTED");
+			System.out.println("NO ADMISSIBLE OXVER SELECTED");
 
 		return output;
 	}

src/algorithms/specialOptions/BIAS/GA.java renamed to src/algorithms/specialOptions/BIAS/ISBDE/kononova2015/GA.java

@@ -1,4 +1,4 @@
-package algorithms.specialOptions.BIAS;
+package algorithms.specialOptions.BIAS.ISBDE.kononova2015;
 
 
 import java.text.DecimalFormat;

src/algorithms/specialOptions/BIAS/GA2.java renamed to src/algorithms/specialOptions/BIAS/ISBDE/kononova2015/GA2.java

@@ -1,4 +1,4 @@
-package algorithms.specialOptions.BIAS;
+package algorithms.specialOptions.BIAS.ISBDE.kononova2015;
 
 
 import java.text.DecimalFormat;

src/algorithms/specialOptions/BIAS/simplifiedGA.java renamed to src/algorithms/specialOptions/BIAS/ISBDE/kononova2015/simplifiedGA.java

@@ -1,4 +1,4 @@
-package algorithms.specialOptions.BIAS;
+package algorithms.specialOptions.BIAS.ISBDE.kononova2015;
 
 import static utils.algorithms.Misc.generateRandomSolution;
 

src/algorithms/specialOptions/BIAS/simplifiedGA2.java renamed to src/algorithms/specialOptions/BIAS/ISBDE/kononova2015/simplifiedGA2.java

@@ -1,4 +1,4 @@
-package algorithms.specialOptions.BIAS;
+package algorithms.specialOptions.BIAS.ISBDE.kononova2015;
 
 import static utils.algorithms.Misc.generateRandomSolution;
 
@@ -130,7 +130,6 @@ public FTrend execute(Problem problem, int maxEvaluations) throws Exception
 					population[rand][n] = xChild[n];
 				fitnesses[rand] = fChild;
 
-				
 				line =""+newID+" "+indexParent1+" "+indexParent2+" "+formatter(fChild)+" "+i+" "+indexRand;
 				for(int n = 0; n < problemDimension; n++)
 					line+=" "+formatter(xChild[n]);

src/algorithms/specialOptions/BIAS/NelderMeadISB.java renamed to src/algorithms/specialOptions/BIAS/NelderMead.java

@@ -28,7 +28,7 @@
 /**
  * A Nelder-Mead simplex search.
  */
-public final class NelderMeadISB extends AlgorithmBias {
+public final class NelderMead extends AlgorithmBias {
 
 	static String Dir = "/home/facaraff/Desktop/KONODATA/NelderMead/";