Fix an issue where the correct pressures for the offsprings and parents reduction were not used/set

libeasea/CPopulation.cpp

@@ -145,10 +145,10 @@ void CPopulation::optimiseOffspringPopulation(){
  */
 void CPopulation::reducePopulation(CIndividual** population, unsigned populationSize,
 					  CIndividual** reducedPopulation, unsigned obSize,
-					  CSelectionOperator* replacementOperator){
+					  CSelectionOperator* replacementOperator,int pressure){
 
 
-  replacementOperator->initialize(population,replacementPressure,populationSize);
+  replacementOperator->initialize(population,pressure,populationSize);
 
   for( unsigned i=0 ; i<obSize ; i++ ){
 
@@ -177,7 +177,7 @@ CIndividual** CPopulation::reduceParentPopulation(unsigned obSize){
   	nextGeneration = new CIndividual*[obSize];
 
   reducePopulation(parents,actualParentPopulationSize,nextGeneration,obSize,
-		   CPopulation::parentReductionOperator);
+		   CPopulation::parentReductionOperator,parentReductionPressure);
 
   // free no longer needed CIndividuals
   for( unsigned i=0 ; i<actualParentPopulationSize-obSize ; i++ )
@@ -199,7 +199,7 @@ CIndividual** CPopulation::reduceOffspringPopulation(unsigned obSize){
   CIndividual** nextGeneration = new CIndividual*[offspringPopulationSize];
 
   reducePopulation(offsprings,actualOffspringPopulationSize,nextGeneration,obSize,
-		   CPopulation::offspringReductionOperator);
+		   CPopulation::offspringReductionOperator,offspringReductionPressure);
 
   //printf("POPULATION SIZE %d\n",actualOffspringPopulationSize-obSize);
   // free no longer needed CIndividuals
@@ -296,7 +296,7 @@ void CPopulation::reduceTotalPopulation(CIndividual** elitPop){
   replacementOperator->initialize(globalPopulation, replacementPressure,actualGlobalSize);
 
   CPopulation::reducePopulation(globalPopulation,actualGlobalSize,params->elitSize+nextGeneration,
-			       parentPopulationSize-params->elitSize,replacementOperator);
+			       parentPopulationSize-params->elitSize,replacementOperator,replacementPressure);
 
 
   for( unsigned int i=0 ; i<((int)actualGlobalSize+params->elitSize)-(int)parentPopulationSize ; i++ )

libeasea/include/CPopulation.h

@@ -78,8 +78,7 @@ public:
 
   virtual void evaluateOffspringPopulation();
   virtual void optimiseOffspringPopulation();
-  CIndividual** reducePopulations(CIndividual** population, unsigned populationSize,
-			       CIndividual** reducedPopulation, unsigned obSize);
+  CIndividual** reducePopulations(CIndividual** population, unsigned populationSize,CIndividual** reducedPopulation, unsigned obSize,int pressure);
   CIndividual** reduceParentPopulation(unsigned obSize);
   CIndividual** reduceOffspringPopulation(unsigned obSize);
   void reduceTotalPopulation(CIndividual** elitPop);
@@ -118,7 +117,7 @@ public:
 
   static void reducePopulation(CIndividual** population, unsigned populationSize,
 				       CIndividual** reducedPopulation, unsigned obSize,
-				       CSelectionOperator* replacementOperator);
+				       CSelectionOperator* replacementOperator,int pressure);
   void syncOutVector();
   void syncInVector();