X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=src%2Fmain.cpp;h=36dd6028c472b0b983d04aaeab8652eb0d04e1c5;hb=5e4a04634f1d31d4c774b44184cf08d3faf4d02a;hp=9388101bd3d90fd26752d108b802a990011a07ed;hpb=12625bb2d19ee89abacc2456bff57dc22aa3a526;p=genetic.git

diff --git a/src/main.cpp b/src/main.cpp
index 9388101..36dd602 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,15 +1,23 @@
 #include <iostream>
 #include <vector>
+#include <map>
+#include <string>
 
 #include "gene.h"
 #include "chromosome.h"
 #include "generation.h"
-#include "generator/generation.h"
+#include "generator/bit.h"
 
 #include "selection/roulette.h"
-
+#include "selection/linearRankSelection.h"
+#include "crossover/crossover.h"
+#include "mutation/mutation.h"
 #include "fitness/wsti.h"
 
+#include "algorithm.h"
+#include "condition/condition.h"
+#include "condition/generationLimit.h"
+
 using namespace std;
 using namespace genetic;
 
@@ -17,33 +25,27 @@ int main() {
     typedef Gene<int> _Gene;
     typedef Chromosome<_Gene> _Chromosome;
 
-    const int chromosomeSize = 11;
-    const int generationSize = 20;
-    WSTI<_Chromosome> fitness(0.5, 2.5);
-
-    generator::Generation<_Chromosome> generationGenerator(generationSize, chromosomeSize);
-    Generation<_Chromosome> generation = generationGenerator.breed();
-
-    cout << "Generation:\n";
-    for (unsigned int i = 0; i < generation.get().size(); i++) {
-        cout << "# ";
-        for (unsigned int j = 0; j < generation.get()[i].get().size(); j++) {
-            cout << generation.get()[i].get()[j].get();
-        }
-        cout << "\n";
-    }
-
-    Roulette<_Chromosome> roulette(generation, fitness);
-    Generation<_Chromosome> newGeneration = roulette.draw();
-
-    cout << "New Generation:\n";
-    for (unsigned int i = 0; i < newGeneration.get().size(); i++) {
-        cout << "# ";
-        for (unsigned int j = 0; j < newGeneration.get()[i].get().size(); j++) {
-            cout << newGeneration.get()[i].get()[j].get();
-        }
-        cout << "\n";
-    }
+    typedef WSTI<_Chromosome> _Fitness;
+    typedef LinearRankSelection<_Chromosome> _Selection;
+    typedef Crossover<_Chromosome> _Crossover;
+    typedef Mutation<_Chromosome> _Mutation;
+
+    typedef generator::Bit<_Chromosome> _Generator;
+    typedef Algorithm<_Chromosome, _Selection, _Crossover, _Mutation, _Fitness> _Algorithm;
+    typedef GenerationLimit<_Chromosome> _Condition;
+
+    const int chromosomeSize = 10;
+    const int generationSize = 200;
+    const double crossoverChance = 0.75;
+    const double mutationChance = 0.01;
+
+    _Fitness fitness(0.5, 2.5);
+    _Generator generationGenerator(generationSize, chromosomeSize);
+
+    _Algorithm algorithm(generationGenerator, fitness, crossoverChance, mutationChance);
+    _Condition condition(1000);
+
+    algorithm.searchForResult(condition);
 
     return 0;
 }