Remove some not used namespace declarations.

[genetic.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 336285a52c5175239d4b074d1500f429710e7cab..a208bbf863505071fd5af846174d223d045840c2 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,8 +1,3 @@
-#include <iostream>
-#include <vector>
-#include <map>
-#include <string>
-
 #include "gene.h"
 #include "chromosome.h"
 #include "generation.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;
@@ -32,10 +26,10 @@ int main() {
 
     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);