GA ISB added

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

Author: facaraff

src/algorithms/specialOptions/BIAS/DE.java

@@ -98,7 +98,7 @@ public FTrend execute(Problem problem, int maxEvaluations) throws Exception
 		int newID = 0;
 		int bestID = -1;
 
-		writeHeader(" popSize "+populationSize+" F "+F+" CR "+CR+" alpha "+alpha, problem);
+		writeHeader("popSize "+populationSize+" F "+F+" CR "+CR+" alpha "+alpha, problem);
 
 		String line = new String();
 

src/algorithms/specialOptions/BIAS/GA.java

@@ -24,9 +24,10 @@ public FTrend execute(Problem problem, int maxEvaluations) throws Exception
 	{	
 		int populationSize = getParameter("p0").intValue(); 
 		int nt =  getParameter("p1").intValue();
-		double CR = getParameter("p2").doubleValue();
-		double d = getParameter("p3").doubleValue(); //fixed to 0.25 in Kononova 2015
-		double md = getParameter("p4").doubleValue(); //fixed to ; 0.01 in Kononova 2015
+		int pt =  getParameter("p2").intValue(); //selection probability for stochastic tournament
+		double CR = getParameter("p3").doubleValue();
+		double d = getParameter("p4").doubleValue(); //fixed to 0.25 in Kononova 2015
+		double md = getParameter("p5").doubleValue(); //fixed to ; 0.01 in Kononova 2015
 
 		FTrend FT = new FTrend();
 		int problemDimension = problem.getDimension(); 
@@ -45,9 +46,11 @@ public FTrend execute(Problem problem, int maxEvaluations) throws Exception
 
 
 		if(this.selectionStrategy == 't') 
-			line+=" popSize "+populationSize+" nt "+nt;
+			line+="popSize "+populationSize+" nt "+nt;
 		else if(this.selectionStrategy == 'r') 
-			line+=" popSize "+populationSize;
+			line+="popSize "+populationSize;
+		else if(this.selectionStrategy == 's') 
+			line+="popSize "+populationSize+" pt "+pt;
 		else
 			System.out.println("Unrecognised selection stratgy!");
 
@@ -114,8 +117,8 @@ else if(this.mutationStrategy == 'g')
 		while (i < maxEvaluations)
 		{
 
-			parent1 = GAParentSelections( selectionStrategy, fitnesses, nt, PRNGCounter);
-			parent2 = GAParentSelections( selectionStrategy, fitnesses, nt,PRNGCounter);
+			parent1 = GAParentSelections( selectionStrategy, fitnesses, nt,pt, PRNGCounter);
+			parent2 = GAParentSelections( selectionStrategy, fitnesses, nt,pt,PRNGCounter);
 			double[] child = GACrossovers(population[parent1], population[parent2], CR, d, crossoverStrategy, PRNGCounter);