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

diff --git a/src/main.cpp b/src/main.cpp
index 920e3f1..36dd602 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,17 +1,22 @@
 #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;
@@ -21,25 +26,26 @@ int main() {
     typedef Chromosome<_Gene> _Chromosome;
 
     typedef WSTI<_Chromosome> _Fitness;
-    typedef Roulette<_Chromosome> _Selection;
+    typedef LinearRankSelection<_Chromosome> _Selection;
     typedef Crossover<_Chromosome> _Crossover;
     typedef Mutation<_Chromosome> _Mutation;
 
-    typedef generator::Generation<_Chromosome> _Generator;
-    typedef Algorithm<_Chromosome, _Selection, _Crossover, _Mutation> _Algorithm;
+    typedef generator::Bit<_Chromosome> _Generator;
+    typedef Algorithm<_Chromosome, _Selection, _Crossover, _Mutation, _Fitness> _Algorithm;
+    typedef GenerationLimit<_Chromosome> _Condition;
 
-    const int chromosomeSize = 11;
-    const int generationSize = 30;
+    const int chromosomeSize = 10;
+    const int generationSize = 200;
     const double crossoverChance = 0.75;
     const double mutationChance = 0.01;
-//     const int numberOfGenerations = 100;
 
     _Fitness fitness(0.5, 2.5);
     _Generator generationGenerator(generationSize, chromosomeSize);
 
     _Algorithm algorithm(generationGenerator, fitness, crossoverChance, mutationChance);
+    _Condition condition(1000);
 
-    algorithm.searchForResult();
+    algorithm.searchForResult(condition);
 
     return 0;
 }