Working single-threaded version

This commit is contained in:
2025-09-07 22:38:04 -05:00
parent bfde57caac
commit bd9820dd68
4 changed files with 67 additions and 25 deletions

View File

@@ -7,6 +7,8 @@
#include "sync.h"
#include "rand.h"
using namespace sync;
namespace genetic {
template <class T> struct Array;
@@ -58,6 +60,8 @@ template <class T> struct Strategy {
template<class T> struct Stats {
std::vector<T> best_cell;
std::vector<float> best_cell_fitness;
TimeSpan setup_time;
TimeSpan run_time;
};
struct CellTracker {
@@ -80,6 +84,11 @@ template <class T> Array<T> make_array(int len) {
}
template <class T> Stats<T> run(Strategy<T> strat) {
Stats<T> stats;
// ************* SETUP **************
TimeSpan start_setup = now();
// Create cells
Array<T> cells = make_array<T>(strat.num_cells);
for (int i = 0; i < cells.len; i++) cells[i] = strat.make_default_cell();
@@ -88,10 +97,10 @@ template <class T> Stats<T> run(Strategy<T> strat) {
Array<CellTracker> trackers = make_array<CellTracker>(strat.num_cells);
for (int i = 0; i < trackers.len; i++) trackers[i] = { .score=0, .cellid=i };
// Init stat tracker
Stats<T> stats;
stats.setup_time = now() - start_setup;
// Run the algorithm
// *********** ALGORITHM ************
TimeSpan start_algo = now();
for (int gen = 0; gen < strat.num_generations; gen++) {
// 1. mutate
for (int i = 0; i < trackers.len; i++) {
@@ -101,24 +110,29 @@ template <class T> Stats<T> run(Strategy<T> strat) {
}
// 2. crossover
if (strat.enable_crossover) {
int parent_end = strat.crossover_parent_num;
int child_begin = trackers.len-strat.crossover_children_num;
int npar = strat.crossover_parent_num;
int nchild = strat.crossover_children_num;
int parent_end = npar;
int child_begin = trackers.len-nchild;
Array<T*> parents = make_array<T*>(npar);
Array<T*> children = make_array<T*>(nchild);
while (parent_end <= child_begin) {
// Get pointers to all the parent cells
Array<T*> parents = make_array<T*>(strat.crossover_parent_num);
for (int i = parent_end-strat.crossover_parent_num; i < parent_end; i++) {
parents[i] = &cells[trackers[i].cellid];
for (int i = parent_end-npar; i < parent_end; i++) {
parents[i - (parent_end-npar)] = &cells[trackers[i].cellid];
}
// Get pointers to all the child cells (these will be overwritten)
Array<T*> children = make_array<T*>(strat.crossover_children_num);
for (int i = child_begin; i < child_begin+strat.crossover_children_num; i++) {
children[i] = &cells[trackers[i].cellid];
for (int i = child_begin; i < child_begin+nchild; i++) {
children[i-child_begin] = &cells[trackers[i].cellid];
}
strat.crossover(parents, children);
parent_end += strat.crossover_parent_stride;
child_begin -= strat.crossover_children_num;
child_begin -= nchild;
}
free(parents.data);
free(children.data);
}
// 3. evaluate
if (strat.test_all) {
@@ -133,12 +147,13 @@ template <class T> Stats<T> run(Strategy<T> strat) {
}
}
// 4. sort
std::sort(&trackers[0], &trackers[trackers.len-1], [strat](CellTracker &a, CellTracker &b){ return strat.higher_fitness_is_better ? a.score < b.score : a.score > b.score; });
std::sort(&trackers[0], &trackers[trackers.len-1], [strat](CellTracker &a, CellTracker &b){ return strat.higher_fitness_is_better ? a.score > b.score : a.score < b.score; });
printf("Gen: %d, Best Score: %f\n", gen, trackers[0].score);
stats.best_cell.push_back(cells[trackers[0].cellid]);
stats.best_cell_fitness.push_back(trackers[0].score);
}
stats.run_time = now() - start_algo;
return stats;
}