Fix Generation Limit Option.

[genetic.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 51beb23d76b9edccb679b3159d005c7cb61f5c11..5ca1684b259efac96f60b37df9f045c19b444d78 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,12 +1,10 @@
-#include <iostream>
-#include <vector>
-#include <map>
-#include <string>
+#include <command/command.h>
+#include <command/option.h>
 
 #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 +14,18 @@
 
 #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;
+int chromosomeSize = 10;
+int generationSize = 10;
+int generationLimit = 100;
+double crossoverChance = 0.75;
+double mutationChance = 0.01;
+
+int main(int argc, char* argv[]) {
+    typedef Gene<bool> _Gene;
     typedef Chromosome<_Gene> _Chromosome;
 
     typedef WSTI<_Chromosome> _Fitness;
@@ -30,20 +33,23 @@ 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 double crossoverChance = 0.75;
-    const double mutationChance = 0.01;
+    command::Command command(argc, argv, {
+        new command::Option<int>("--chromosome-size", "Chromosome size", [](int value)->void { chromosomeSize = value; }),
+        new command::Option<int>("--generation-size", "Generation size", [](int value)->void { generationSize = value; }),
+        new command::Option<float>("--crossover", "Crossover chance", [](float value)->void { crossoverChance = value; }),
+        new command::Option<float>("--mutation", "Mutation chance", [](float value)->void { mutationChance = value; }),
+        new command::Option<float>("--generation-limit", "Limit of generations", [](float value)->void { generationLimit = value; }),
+    });
 
     _Fitness fitness(0.5, 2.5);
     _Generator generationGenerator(generationSize, chromosomeSize);
 
     _Algorithm algorithm(generationGenerator, fitness, crossoverChance, mutationChance);
-    _Condition condition(1000);
+    _Condition condition(generationLimit);
 
     algorithm.searchForResult(condition);