X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=src%2Fmain.cpp;h=a208bbf863505071fd5af846174d223d045840c2;hb=1e175fb658e55f4cc8b894fff288be22998e78af;hp=51beb23d76b9edccb679b3159d005c7cb61f5c11;hpb=4582072584b8ac9a37036fabcaa4d873bddf499f;p=genetic.git

diff --git a/src/main.cpp b/src/main.cpp
index 51beb23..a208bbf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,12 +1,7 @@
-#include <iostream>
-#include <vector>
-#include <map>
-#include <string>
-
 #include "gene.h"
 #include "chromosome.h"
 #include "generation.h"
-#include "generator/bit.h"
+#include "generator/bitGenerator.h"
 
 #include "selection/rouletteSelection.h"
 #include "selection/linearRankSelection.h"
@@ -16,13 +11,12 @@
 
 #include "algorithm.h"
 #include "condition/condition.h"
-#include "condition/generationLimit.h"
+#include "condition/generationLimitCondition.h"
 
-using namespace std;
 using namespace genetic;
 
 int main() {
-    typedef Gene<int> _Gene;
+    typedef Gene<bool> _Gene;
     typedef Chromosome<_Gene> _Chromosome;
 
     typedef WSTI<_Chromosome> _Fitness;
@@ -30,12 +24,12 @@ int main() {
     typedef Crossover<_Chromosome> _Crossover;
     typedef Mutation<_Chromosome> _Mutation;
 
-    typedef generator::Bit<_Chromosome> _Generator;
+    typedef generator::BitGenerator<_Chromosome> _Generator;
     typedef Algorithm<_Chromosome, _Selection, _Crossover, _Mutation, _Fitness> _Algorithm;
-    typedef GenerationLimit<_Chromosome> _Condition;
+    typedef GenerationLimitCondition<_Chromosome> _Condition;
 
     const int chromosomeSize = 10;
-    const int generationSize = 200;
+    const int generationSize = 500;
     const double crossoverChance = 0.75;
     const double mutationChance = 0.01;
 
@@ -43,7 +37,7 @@ int main() {
     _Generator generationGenerator(generationSize, chromosomeSize);
 
     _Algorithm algorithm(generationGenerator, fitness, crossoverChance, mutationChance);
-    _Condition condition(1000);
+    _Condition condition(10000);
 
     algorithm.searchForResult(condition);