diff --git a/src/ibea/combination.cpp b/src/ibea/combination.cpp index f0f171a12367a55d218f2875ab496cf5602dd127..28b3b6dd79af0315326f87df7b73ac8cc02459a4 100644 --- a/src/ibea/combination.cpp +++ b/src/ibea/combination.cpp @@ -1,11 +1,9 @@ #include <utility> #include <cstdlib> -#include <iostream> + #include "../coco/coco.h" #include "population.h" #include "combination.h" -using namespace std; - std::pair <double,double> simple_combination(double parent1, double parent2, diff --git a/src/ibea/ibea.cpp b/src/ibea/ibea.cpp index f519519c651a660b7d251f3c2c5528dfc9f47cca..6d464c5c6aa1231b66799d49c8bbb1b94b2fb2b7 100644 --- a/src/ibea/ibea.cpp +++ b/src/ibea/ibea.cpp @@ -30,7 +30,6 @@ void ibea(evaluate_function_t evaluate, cout << "Initialize" << endl; Population pop = Population(n_individus, dimension, number_of_objectives); Population new_pop = Population(n_individus, dimension, number_of_objectives); - pop.random_init(lower_bounds, upper_bounds, random_generator); /* Iterations */ @@ -41,32 +40,24 @@ void ibea(evaluate_function_t evaluate, pop.evaluate(evaluate); pop.compute_indicators(); pop.compute_fitnesses(kappa); - pop.printFitnesses(); cout << "Evaluation & Fitness done" << endl; new_pop.empty(); cout << "New population !" << endl; while (new_pop.getCurrentSize() < n_individus){ /* 3 Environemental select */ - cout << "Darwin begin" << endl; pop.darwin(kappa); cout << "Darwin done" << endl; - pop.printFitnesses(); + /* 4 */ /* 5 Fill mating pool */ - - cout << "Tournament begin" << endl; binary_tournament(pop, new_pop, mu, random_generator); cout << "Tournament done" << endl; - pop.printFitnesses(); } - cout << "Shit done" << endl; - /* 6 Combination and Mutation */ pop.empty(); - cout << "Shit2 done" << endl; combinate(new_pop, pop, eta, p_combination,random_generator); cout << "Combination done" << endl; mutate(pop, lower_bounds, upper_bounds, eta, p_mutation, random_generator); diff --git a/src/ibea/population.cpp b/src/ibea/population.cpp index 53117815d3771735473a4c8a551611ab202df684..07c86fedd9f1dd6e7b636fa10de0be9406c3dff7 100644 --- a/src/ibea/population.cpp +++ b/src/ibea/population.cpp @@ -1,14 +1,11 @@ #include <cstdlib> #include <cmath> -#include <iostream> #include <cstdio> #include "../coco/coco.h" #include "indicator.h" #include "population.h" -using namespace std; - Population::Population(int size, int dimension, int n_objectives) : size_(size), current_size_(0), dimension_(dimension), n_objectives_(n_objectives) { @@ -27,7 +24,7 @@ Population::Population(int size, int dimension, int n_objectives) : indicator_values_[i] = (double *) coco_allocate_memory(size_*sizeof(double)); } - fitnesses_ = (double *) coco_allocate_memory(dimension_*sizeof(double)); + fitnesses_ = (double *) coco_allocate_memory(size_*sizeof(double)); } Population::~Population(){ @@ -74,13 +71,10 @@ void Population::empty(){ } void Population::setIndiv(int i, int j, double value){ - cout << "setIndiv(" << i << ", " << j << ") : " << size_ << ", " << dimension_ << endl; population_[i][j] = value; - cout << "setIndiv end" << endl; } double Population::getIndiv(int i, int j){ - cout << "getIndiv(" << i << ", " << j << ") : " << size_ << ", " << dimension_ << endl; return population_[i][j]; } @@ -220,8 +214,8 @@ void Population::darwin(double kappa){ } void Population::printPopulation(){ - cout << "Population : " << endl; - for (int i=0; i < current_size_; i++){ + printf("Population : \n"); + for (int i=0; i < size_; i++){ for (int j=0; j < dimension_; j++){ printf("%+6.4lf ", population_[i][j]); } @@ -230,8 +224,8 @@ void Population::printPopulation(){ } void Population::printValues(){ - cout << "Values : " << endl; - for (int i=0; i < current_size_; i++){ + printf("Values : \n"); + for (int i=0; i < size_; i++){ for (int j=0; j < dimension_; j++){ printf("%+6.4lf ", values_[i][j]); } @@ -240,9 +234,9 @@ void Population::printValues(){ } void Population::printIndicatorValues(){ - cout << "Indicator Values : " << endl; - for (int i=0; i < current_size_; i++){ - for (int j=0; j < current_size_; j++){ + printf("Indicator Values : \n"); + for (int i=0; i < size_; i++){ + for (int j=0; j < size_; j++){ printf("%+6.4lf ", indicator_values_[i][j]); } printf("\n"); @@ -250,8 +244,8 @@ void Population::printIndicatorValues(){ } void Population::printFitnesses(){ - cout << "Fitnesses : " << endl; - for (int i=0; i < current_size_; i++){ + printf("Fitnesses : \n"); + for (int i=0; i < size_; i++){ printf("%+6.4lf ", fitnesses_[i]); } printf("\n"); diff --git a/src/ibea/tournament.cpp b/src/ibea/tournament.cpp index e5c58331052da10a3c72deccf3fd958f0135a524..cc9f7e3834f89f8199af945f320d5164221832e8 100644 --- a/src/ibea/tournament.cpp +++ b/src/ibea/tournament.cpp @@ -1,11 +1,7 @@ -#include <iostream> - #include "../coco/coco.h" #include "population.h" #include "tournament.h" -using namespace std; - void binary_tournament(Population & population_in, Population & population_out, int mu, @@ -23,26 +19,15 @@ void binary_tournament(Population & population_in, if (population_in.getFit(i) > population_in.getFit(j)) { for (int m = 0; m < population_out.getDim(); m++){ - cout << "test2" << endl; population_out.setIndiv(size_out + k, m, population_in.getIndiv(i,m)); - cout << "test3" << endl; } } else { for (int m = 0; m < population_out.getDim(); m++){ - population_in.printPopulation(); - population_in.printFitnesses(); - cout << "test" << endl; population_out.setIndiv(size_out + k, m, population_in.getIndiv(j,m)); - cout << "test1" << endl; } - cout << "test5" << endl; } - cout << "test6" << endl; k++; - cout << "test7" << endl; } - cout << "test8" << endl; population_out.setCurrenSize(size_out+k); - cout << "test9" << endl; }