Garmelon/geneross
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up project

Browse source 
Remove unnecessary files and change fitness value to unsigned long long.
This commit is contained in:
Joscha 2017-04-27 05:45:46 +00:00
parent d38e45dac8
commit 15640c9656
4 changed files with 4 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Fitness.cpp
View file

@ -4,9 +4,6 @@
Fitness::Fitness() {}
Fitness::Fitness(sf::Texture target, float scale)
{
this->target = target;
@ -36,7 +33,7 @@ bool Fitness::loadShader(std::string filename)
}
double Fitness::of(Chromosome chr)
unsigned long long Fitness::of(Chromosome chr)
{
// first, render a reduced, shaderized version to RenderTextures
this->tex.clear();
@ -52,7 +49,7 @@ double Fitness::of(Chromosome chr)
// then, download the result as an image and add the pixels
sf::Image image = this->comp.getTexture().copyToImage();
sf::Vector2u size = image.getSize();
double fitness = 0;
unsigned long long fitness = 0;
for (unsigned int x=0; x<size.x; ++x) {
for (unsigned int y=0; y<size.y; ++y) {
sf::Color color = image.getPixel(x, y);

5
src/Fitness.hpp
View file

@ -8,11 +8,10 @@
class Fitness
{
public:
Fitness();
Fitness(sf::Texture target, float scale=0.5);
Fitness(sf::Texture target, float scale=1);
bool loadShader(std::string filename);
double of(Chromosome chr);
unsigned long long of(Chromosome chr);
sf::Texture target; // base image to compare against
sf::RenderTexture tex; // big RenderWindow containg the Chromosome to be evaluated