wersja pod VS
This commit is contained in:
parent
3eaa94999a
commit
6f016b84a7
15
Main.cpp
15
Main.cpp
@ -13,7 +13,7 @@
|
||||
#include <stdio.h>
|
||||
#include <cstdlib>
|
||||
#include <ctime>
|
||||
#include<bits/stdc++.h>
|
||||
//#include<bits/stdc++.h>
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
|
||||
@ -49,7 +49,11 @@ string kod_genetyczny[27][27];
|
||||
|
||||
string generateValue() {
|
||||
char trash[100];
|
||||
string x = itoa(rand() % 1000,trash,10);
|
||||
string x;
|
||||
srand(time(NULL));
|
||||
int random = (rand() % 1000, 1);
|
||||
//string x = itoa(rand() % 1000,trash,10);
|
||||
x = to_string(random);
|
||||
if (x.size() == 2) {
|
||||
x = "0" + x;
|
||||
}
|
||||
@ -128,7 +132,7 @@ bool comparePair(const pair<int, string>&i, const pair<int, string>&j)
|
||||
void ranking(string * population,string * parents, int populationSize, int parentsNumber) {
|
||||
|
||||
int i;
|
||||
pair <int,string> fitnessTable[populationSize];
|
||||
pair <int,string> *fitnessTable=new pair <int, string>[populationSize];
|
||||
for(i=0;i<populationSize;i++) {
|
||||
fitnessTable[i] = make_pair(fitness(population[i]),population[i]);
|
||||
}
|
||||
@ -138,6 +142,7 @@ void ranking(string * population,string * parents, int populationSize, int paren
|
||||
for(i=0;i<parentsNumber;i++) {
|
||||
parents[i] = fitnessTable[i].second;
|
||||
}
|
||||
delete[] fitnessTable;
|
||||
}
|
||||
|
||||
|
||||
@ -154,7 +159,7 @@ bool exists(int len, int * array, int element) {
|
||||
void selection(string * population,string * parents, int populationSize, int parentsNumber) {
|
||||
|
||||
int i,j,k;
|
||||
pair <int,string> fitnessTable[populationSize];
|
||||
pair <int,string> *fitnessTable= new pair <int, string>[populationSize];
|
||||
for(i=0;i<populationSize;i++) {
|
||||
fitnessTable[i] = make_pair(fitness(population[i]),population[i]);
|
||||
}
|
||||
@ -162,7 +167,7 @@ void selection(string * population,string * parents, int populationSize, int par
|
||||
sort(fitnessTable,fitnessTable+populationSize,comparePair);
|
||||
|
||||
int roulette;
|
||||
int taken[parentsNumber];
|
||||
int *taken=new int[parentsNumber];
|
||||
int sum = 0;
|
||||
for(i=0;i<parentsNumber;i++) {
|
||||
for(j = populationSize - 1;j>=0;j--) {
|
||||
|
Loading…
Reference in New Issue
Block a user