Garmelon/geneross
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crossover

Browse source
This commit is contained in:
Joscha 2017-04-30 12:33:29 +00:00
parent 075b35d5d0
commit 442a5f8434
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/Chromosome.cpp
View file

@ -36,8 +36,8 @@ Chromosome::Chromosome(Chromosome& father, Chromosome& mother) :
{ {
std::uniform_int_distribution<> booldist(0, 1); std::uniform_int_distribution<> booldist(0, 1);
auto fpair = this->selectSegment(father.genes); // auto fpair = this->selectSegment(father.genes);
auto mpair = this->selectSegment(mother.genes); // auto mpair = this->selectSegment(mother.genes);
// auto cur_it = this->genes.begin(); // auto cur_it = this->genes.begin();
// std::cout << std::distance(cur_it, father.genes.begin()) << std::endl; // std::cout << std::distance(cur_it, father.genes.begin()) << std::endl;
@ -46,14 +46,25 @@ Chromosome::Chromosome(Chromosome& father, Chromosome& mother) :
// cur_it = this->genes.insert(cur_it, mpair.first, mpair.second); // cur_it = this->genes.insert(cur_it, mpair.first, mpair.second);
// cur_it = this->genes.insert(cur_it, father.genes.begin(), fpair.first); // cur_it = this->genes.insert(cur_it, father.genes.begin(), fpair.first);
// if (booldist(*Chromosome::re)) {
// this->genes.insert(this->genes.begin(), fpair.second, father.genes.end());
// this->genes.insert(this->genes.begin(), mpair.first, mpair.second);
// this->genes.insert(this->genes.begin(), father.genes.begin(), fpair.first);
// } else {
// this->genes.insert(this->genes.begin(), mpair.second, mother.genes.end());
// this->genes.insert(this->genes.begin(), fpair.first, fpair.second);
// this->genes.insert(this->genes.begin(), mother.genes.begin(), mpair.first);
// }
auto gene_father = this->selectGene(father.genes);
auto gene_mother = this->selectGene(mother.genes);
if (booldist(*Chromosome::re)) { if (booldist(*Chromosome::re)) {
this->genes.insert(this->genes.begin(), fpair.second, father.genes.end()); this->genes.insert(this->genes.begin(), father.genes.begin(), gene_father);
this->genes.insert(this->genes.begin(), mpair.first, mpair.second); this->genes.insert(this->genes.begin(), gene_mother, mother.genes.end());
this->genes.insert(this->genes.begin(), father.genes.begin(), fpair.first);
} else { } else {
this->genes.insert(this->genes.begin(), mpair.second, mother.genes.end()); this->genes.insert(this->genes.begin(), mother.genes.begin(), gene_mother);
this->genes.insert(this->genes.begin(), fpair.first, fpair.second); this->genes.insert(this->genes.begin(), gene_father, father.genes.end());
this->genes.insert(this->genes.begin(), mother.genes.begin(), mpair.first);
} }
} }