tri11paragon
/
blt-gp
mirror of https://github.com/tri11paragon/blt-gp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix stack completely, tests are passed

thread
Brett 2024-07-16 23:45:02 -04:00
parent 45db2acb11
commit cbbf7a9cf5
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.25) cmake_minimum_required(VERSION 3.25)
project(blt-gp VERSION 0.0.87) project(blt-gp VERSION 0.0.88)
include(CTest) include(CTest)

15
examples/pg_symbolic_regression.cpp
View File

@ -34,7 +34,10 @@ std::array<context, 200> fitness_cases;
blt::gp::prog_config_t config = blt::gp::prog_config_t() blt::gp::prog_config_t config = blt::gp::prog_config_t()
.set_initial_min_tree_size(2) .set_initial_min_tree_size(2)
.set_initial_max_tree_size(6) .set_initial_max_tree_size(6)
.set_elite_count(0) .set_elite_count(10)
.set_crossover_chance(0.9)
.set_mutation_chance(0.1)
.set_reproduction_chance(0.1)
.set_max_generations(50) .set_max_generations(50)
.set_pop_size(500) .set_pop_size(500)
.set_thread_count(0); .set_thread_count(0);
@ -103,10 +106,10 @@ int main()
builder.add_operator(sub); builder.add_operator(sub);
builder.add_operator(mul); builder.add_operator(mul);
builder.add_operator(pro_div); builder.add_operator(pro_div);
builder.add_operator(op_sin); //builder.add_operator(op_sin);
builder.add_operator(op_cos); //builder.add_operator(op_cos);
builder.add_operator(op_exp); //builder.add_operator(op_exp);
builder.add_operator(op_log); //builder.add_operator(op_log);
builder.add_operator(lit, true); builder.add_operator(lit, true);
builder.add_operator(op_x); builder.add_operator(op_x);
@ -121,7 +124,7 @@ int main()
{ {
BLT_TRACE("------------{Begin Generation %ld}------------", program.get_current_generation()); BLT_TRACE("------------{Begin Generation %ld}------------", program.get_current_generation());
BLT_START_INTERVAL("Symbolic Regression", "Gen"); BLT_START_INTERVAL("Symbolic Regression", "Gen");
program.create_next_generation(blt::gp::select_tournament_t{}, blt::gp::select_tournament_t{}, blt::gp::select_tournament_t{}); program.create_next_generation(blt::gp::select_fitness_proportionate_t{}, blt::gp::select_fitness_proportionate_t{}, blt::gp::select_fitness_proportionate_t{});
BLT_END_INTERVAL("Symbolic Regression", "Gen"); BLT_END_INTERVAL("Symbolic Regression", "Gen");
BLT_TRACE("Move to next generation"); BLT_TRACE("Move to next generation");
BLT_START_INTERVAL("Symbolic Regression", "Fitness"); BLT_START_INTERVAL("Symbolic Regression", "Fitness");

2
include/blt/gp/config.h
View File

@ -39,7 +39,7 @@ namespace blt::gp
// percent chance that we will do mutation // percent chance that we will do mutation
double mutation_chance = 0.1; double mutation_chance = 0.1;
// percent chance we will do reproduction (copy individual) // percent chance we will do reproduction (copy individual)
double reproduction_chance = 0; double reproduction_chance = 0.1;
// everything else will just be selected // everything else will just be selected
blt::size_t elites = 0; blt::size_t elites = 0;

2
include/blt/gp/stack.h
View File

@ -418,7 +418,6 @@ namespace blt::gp
~stack_allocator() ~stack_allocator()
{ {
free_chain(head);
if (head != nullptr) if (head != nullptr)
{ {
auto blk = head->metadata.next; auto blk = head->metadata.next;
@ -429,6 +428,7 @@ namespace blt::gp
std::free(ptr); std::free(ptr);
} }
} }
free_chain(head);
} }
template<typename T> template<typename T>