added generate offspring

Author: Dpbm

game/players/ai_player.cpp

@@ -70,7 +70,7 @@ namespace Players{
 
     this->input_data->update_value(0, 0, (double)(px-fx)/w);  
     this->input_data->update_value(0, 1, (double)(py-fy)/h);
-    this->input_data->update_value(0, 2, get_angle(px, py, fx, fy) / (2*PI));
+    // this->input_data->update_value(0, 2, get_angle(px, py, fx, fy) / (2*PI));
   }
 
 

game/players/ai_player.h

@@ -29,8 +29,8 @@ namespace Players{
     private:
       Chromosome* chromosome = nullptr;
       NN* nn = new NN;   
-      Layer* input_layer = new Layer(3, true);
-      Matrix* input_data = new Matrix(3, 1);
+      Layer* input_layer = new Layer(2, true);
+      Matrix* input_data = new Matrix(2, 1);
 
       void setup_nn();
       void setup_chromosome();

genetic/population.cpp

@@ -1,10 +1,16 @@
 #include <cstdint>
+#include <stdexcept>
 #include <unistd.h>
 #include "population.h"
 #include "../game/board.h"
 #include "../helpers/utils.h"
+#include "chromosome.h"
+#include "gene.h"
 
+using std::invalid_argument;
 using Game::Board;
+using Chromosomes::Chromosome;
+using Genes::Gene;
 using Utils::random_int;
 
 namespace Genetic{
@@ -38,7 +44,7 @@ namespace Genetic{
 
   void Population::generate_food_positions(uint8_t total, uint8_t w, uint8_t h){
     for(size_t _ = 0; _ < total; _++)
-      this->food_positions.push_back(vec2{random_int(0, h-1), random_int(0, w-1)});
+      this->food_positions.push_back(vec2{(int16_t)random_int(0, h-1), (int16_t)random_int(0, w-1)});
       // TODO: refactor this random position to a especialist class or something like this
   }
 
@@ -134,7 +140,8 @@ namespace Genetic{
 
   void Population::next_gen(){
     Individual** parents = this->select_parents();
-    //generate the offspring
+    Chromosome* offspring = this->generate_offspring(parents[0]->player->get_chromossome(), parents[1]->player->get_chromossome());
+  
     //reset individuals
     //replicate
     //mutate
@@ -170,6 +177,30 @@ namespace Genetic{
     return parents;
   }
 
+  Chromosome* Population::generate_offspring(Chromosome* ch1, Chromosome* ch2){
+    if(ch1->get_size() != ch2->get_size())
+      throw invalid_argument("Both Chromosomes must have the same size!");
+
+    uint64_t ch_size = ch1->get_size();
+
+    Chromosome* offspring = new Chromosome(ch_size);
+    Gene* offspring_genes = new Gene[ch_size];
+
+    Gene* ch1_genes = ch1->get_genes();
+    Gene* ch2_genes = ch2->get_genes();
+
+    uint64_t pivot = random_int(0, ch_size);
+    for(size_t i = 0; i < ch_size; i++){
+      if(i < pivot)
+        offspring_genes[i].set_gene_value(ch1_genes[i].get_gene_value());
+      else
+        offspring_genes[i].set_gene_value(ch2_genes[i].get_gene_value());
+    }
+    offspring->copy_genes(offspring_genes);
+
+    return offspring;
+  }
+
   void Population::append_individual(Individual* ind){
     this->individuals.push_back(ind);
   }

genetic/population.h

@@ -5,12 +5,14 @@
 #include "../game/players/ai_player.h"
 #include "../game/board.h"
 #include "../helpers/utils.h"
+#include "../genetic/chromosome.h"
 
 using std::vector;
 using Game::Board;
 using Players::AIPlayer;
 using Utils::vec2;
 using Players::Directions;
+using Chromosomes::Chromosome;
 
 namespace Genetic {
   typedef struct Individual{
@@ -29,6 +31,7 @@ namespace Genetic {
       void next_gen();
       void run();
       uint32_t get_gen();
+      Chromosome* generate_offspring(Chromosome* ch1, Chromosome* ch2);
       uint16_t get_total_alive();
       uint8_t get_total_win();
       uint16_t get_best_score();

helpers/utils.cpp

@@ -38,11 +38,11 @@ namespace Utils {
     return distr(eng);
   }
 
-  int16_t random_int(uint8_t start, uint8_t end){
+  int64_t random_int(uint64_t start, uint64_t end){
     random_device device;
     mt19937 eng(device());
-    uniform_int_distribution<int16_t> distr(start, end);
-    int16_t result = distr(eng);
+    uniform_int_distribution<int64_t> distr(start, end);
+    int64_t result = distr(eng);
     return result;
   }
 

helpers/utils.h

@@ -17,7 +17,7 @@ namespace Utils {
   }vec2;
 
   double random(double start, double end);
-  int16_t random_int(uint8_t start, uint8_t end);
+  int64_t random_int(uint64_t start, uint64_t end);
   void append_to_file(string filename, string data);
   void create_file(string filename, string data);
   vector<Matrix*> parse_weigths(string filename);

manual_tests.cpp

@@ -127,5 +127,20 @@ int main(){
 
   cout << "parent 1 " << parents[0] << endl;
   cout << "parent 2 " << parents[1] << endl;
+  
+  cout << endl << "!!!!testig generate offsping!!!!" << endl;
+  Population p2(0);
+  Chromosome chromosome1(10);
+  Chromosome chromosome2(10);
+
+  cout << "Chromosome 1: ";
+  chromosome1.show();
+  cout << "Chromosome 2: ";
+  chromosome2.show();
+  
+  Chromosome* offsping = p2.generate_offspring(&chromosome1, &chromosome2);
+  cout << "offsping: ";
+  offsping->show();
+  delete offsping;
 }
 

tests/population_test.cc

@@ -1,10 +1,16 @@
 #include <gtest/gtest.h>
+#include <stdexcept>
 #include "../genetic/population.h"
 #include "../game/players/player.h"
+#include "../genetic/chromosome.h"
+#include "../genetic/gene.h"
 
+using std::invalid_argument;
 using Genetic::Population;
 using Genetic::Individual;
 using Players::Directions;
+using Chromosomes::Chromosome;
+using Genes::Gene;
 
 namespace {
   TEST(ValueTest, OnlyTwoIndividualsSelectParentsTest){
@@ -90,5 +96,19 @@ namespace {
     ASSERT_EQ(parents[1], ind2);
     delete[] parents;
   }
+
+
+  TEST(ValuesTest, GenerateOffSpringChromosomesWithDifferentSizesTest){
+    Population p(0);
+    Chromosome ch1(10);
+    Chromosome ch2(3);
+    ASSERT_THROW({ p.generate_offspring(&ch1, &ch2); }, invalid_argument);
+  }
 
+  TEST(ValuesTest, GenerateOffSpringChromosomesWithSameSizesTest){
+    Population p(0);
+    Chromosome ch1(10);
+    Chromosome ch2(10);
+    ASSERT_NO_THROW({ p.generate_offspring(&ch1, &ch2); });
+  }
 }