dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
genetic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename GenerationLimit to GenerationLimitCondition. Add test for this class.
[genetic.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index 51beb23d76b9edccb679b3159d005c7cb61f5c11..daf7fbcbbf047b95a5885b51a296463077e7030c 100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-6,7
+6,7
@@
#include "gene.h"
#include "chromosome.h"
#include "generation.h"
#include "gene.h"
#include "chromosome.h"
#include "generation.h"
-#include "generator/bit.h"
+#include "generator/bit
Generator
.h"
#include "selection/rouletteSelection.h"
#include "selection/linearRankSelection.h"
#include "selection/rouletteSelection.h"
#include "selection/linearRankSelection.h"
@@
-16,13
+16,13
@@
#include "algorithm.h"
#include "condition/condition.h"
#include "algorithm.h"
#include "condition/condition.h"
-#include "condition/generationLimit.h"
+#include "condition/generationLimit
Condition
.h"
using namespace std;
using namespace genetic;
int main() {
using namespace std;
using namespace genetic;
int main() {
- typedef Gene<
int
> _Gene;
+ typedef Gene<
bool
> _Gene;
typedef Chromosome<_Gene> _Chromosome;
typedef WSTI<_Chromosome> _Fitness;
typedef Chromosome<_Gene> _Chromosome;
typedef WSTI<_Chromosome> _Fitness;
@@
-30,9
+30,9
@@
int main() {
typedef Crossover<_Chromosome> _Crossover;
typedef Mutation<_Chromosome> _Mutation;
typedef Crossover<_Chromosome> _Crossover;
typedef Mutation<_Chromosome> _Mutation;
- typedef generator::Bit<_Chromosome> _Generator;
+ typedef generator::Bit
Generator
<_Chromosome> _Generator;
typedef Algorithm<_Chromosome, _Selection, _Crossover, _Mutation, _Fitness> _Algorithm;
typedef Algorithm<_Chromosome, _Selection, _Crossover, _Mutation, _Fitness> _Algorithm;
- typedef GenerationLimit<_Chromosome> _Condition;
+ typedef GenerationLimit
Condition
<_Chromosome> _Condition;
const int chromosomeSize = 10;
const int generationSize = 200;
const int chromosomeSize = 10;
const int generationSize = 200;