From b6da05660f98db0bf8ce1e72bf427349d40583fe Mon Sep 17 00:00:00 2001 From: TriantaTV Date: Sun, 24 Sep 2023 18:26:03 -0500 Subject: [PATCH] Added getting fitness and lowered board size --- src/chess.cpp | 11 +++++------ src/chess.hpp | 3 +-- src/n_queens.cpp | 1 + 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/chess.cpp b/src/chess.cpp index 1ae5e59..2850eae 100644 --- a/src/chess.cpp +++ b/src/chess.cpp @@ -16,13 +16,11 @@ int GenerateRandomNumber(int generationLimit) { } GeneticDefaults::GeneticDefaults(void) { - size = 8; - length = 8; + size = 4; } -GeneticDefaults::GeneticDefaults(unsigned int size, unsigned int length) { +GeneticDefaults::GeneticDefaults(unsigned int size) { this->size = size; - this->length = length; } GeneticChess::GeneticChess(void) { @@ -51,10 +49,11 @@ void GeneticChess::Print(void) { // Gets the fitness of the population unsigned int GeneticChess::GetFitness(void) { - int fitness = 0; - for (int i : board) { + unsigned int fitness = 0; + for (unsigned int i : board) { if (!IsQueenThreatened(i)) { fitness++; } } + std::cout << fitness << std::endl; return fitness; } diff --git a/src/chess.hpp b/src/chess.hpp index bebbaa9..fa76614 100644 --- a/src/chess.hpp +++ b/src/chess.hpp @@ -11,9 +11,8 @@ struct GeneticDefaults { const float kProbabilityMutation = 0.001; //mutation probability (typical val.) const unsigned int generationLimit = 10000; //number of generations (something huge) unsigned int size; //population size (change to something even) - unsigned int length; //string length (don't change) GeneticDefaults(void); - GeneticDefaults(unsigned int size, unsigned int length); //custom generation sizes + GeneticDefaults(unsigned int size); //custom generation sizes }; class GeneticChess { diff --git a/src/n_queens.cpp b/src/n_queens.cpp index a74930e..154496d 100644 --- a/src/n_queens.cpp +++ b/src/n_queens.cpp @@ -7,6 +7,7 @@ int main(){ GeneticChess population; population.Print(); + population.GetFitness(); /* unsigned char population[N] = {0};