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

idk what is broken

dev-func-drop
Brett 2025-01-21 19:35:20 -05:00
parent b79fc5a0f1
commit 82c535dbd1
4 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -27,7 +27,7 @@ macro(compile_options target_name)
sanitizers(${target_name}) sanitizers(${target_name})
endmacro() endmacro()
project(blt-gp VERSION 0.3.29) project(blt-gp VERSION 0.3.30)
include(CTest) include(CTest)

24
include/blt/gp/program.h
View File

@ -766,25 +766,27 @@ namespace blt::gp
{ {
if (get_random().choice(selection_probabilities.crossover_chance)) if (get_random().choice(selection_probabilities.crossover_chance))
{ {
thread_local tree_t tree{*this}; // if (c2 == nullptr)
tree.clear(*this); // return 0;
auto ptr = c2; // auto ptr = c2;
if (ptr == nullptr) // if (ptr == nullptr)
ptr = &tree; // ptr = &tree_t::get_thread_local(*this);
#ifdef BLT_TRACK_ALLOCATIONS #ifdef BLT_TRACK_ALLOCATIONS
auto state = tracker.start_measurement_thread_local(); auto state = tracker.start_measurement_thread_local();
#endif #endif
const tree_t* p1; const tree_t* p1;
const tree_t* p2; const tree_t* p2;
size_t runs = 0; size_t runs = 0;
// double parent_val = 0; tree_t tree{*this};
do do
{ {
// BLT_TRACE("%lu %p %p", runs, &c1, &tree);
p1 = &crossover.select(*this, current_pop); p1 = &crossover.select(*this, current_pop);
p2 = &crossover.select(*this, current_pop); p2 = &crossover.select(*this, current_pop);
c1.copy_fast(*p1); c1.copy_fast(*p1);
ptr->copy_fast(*p2); tree.copy_fast(*p2);
// ptr->copy_fast(*p2);
if (++runs >= config.crossover.get().get_config().max_crossover_iterations) if (++runs >= config.crossover.get().get_config().max_crossover_iterations)
return 0; return 0;
@ -792,7 +794,7 @@ namespace blt::gp
crossover_calls.value(1); crossover_calls.value(1);
#endif #endif
} }
while (!config.crossover.get().apply(*this, *p1, *p2, c1, *ptr)); while (!config.crossover.get().apply(*this, *p1, *p2, c1, tree));
#ifdef BLT_TRACK_ALLOCATIONS #ifdef BLT_TRACK_ALLOCATIONS
tracker.stop_measurement_thread_local(state); tracker.stop_measurement_thread_local(state);
crossover_calls.call(); crossover_calls.call();
@ -802,8 +804,10 @@ namespace blt::gp
crossover_allocations.set_value(std::max(crossover_allocations.get_value(), state.getAllocatedByteDifference())); crossover_allocations.set_value(std::max(crossover_allocations.get_value(), state.getAllocatedByteDifference()));
} }
#endif #endif
if (c2 == nullptr) // if (c2 == nullptr)
tree.clear(*this); // tree_t::get_thread_local(*this);
if (c2 != nullptr)
*c2 = tree;
return 2; return 2;
} }
if (get_random().choice(selection_probabilities.mutation_chance)) if (get_random().choice(selection_probabilities.mutation_chance))

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

@ -613,6 +613,8 @@ namespace blt::gp
clear(*m_program); clear(*m_program);
} }
static tree_t& get_thread_local(gp_program& program);
private: private:
void handle_operator_inserted(const op_container_t& op); void handle_operator_inserted(const op_container_t& op);

19
src/tree.cpp
View File

@ -365,15 +365,15 @@ namespace blt::gp
values.copy_from(copy_ptr_c1 + c1_subtree_bytes, c1_stack_after_bytes); values.copy_from(copy_ptr_c1 + c1_subtree_bytes, c1_stack_after_bytes);
// now swap the operators // now swap the operators
auto insert_point_c1 = c1_subtree_begin_itr - 1; // auto insert_point_c1 = c1_subtree_begin_itr - 1;
auto insert_point_c2 = c2_subtree_begin_itr - 1; // auto insert_point_c2 = c2_subtree_begin_itr - 1;
// invalidates [begin, end()) so the insert points should be fine // invalidates [begin, end()) so the insert points should be fine
operations.erase(c1_subtree_begin_itr, c1_subtree_end_itr); auto insert_point_c1 = operations.erase(c1_subtree_begin_itr, c1_subtree_end_itr);
other_tree.operations.erase(c2_subtree_begin_itr, c2_subtree_end_itr); auto insert_point_c2 = other_tree.operations.erase(c2_subtree_begin_itr, c2_subtree_end_itr);
operations.insert(++insert_point_c1, c2_subtree_operators.begin(), c2_subtree_operators.end()); operations.insert(insert_point_c1, c2_subtree_operators.begin(), c2_subtree_operators.end());
other_tree.operations.insert(++insert_point_c2, c1_subtree_operators.begin(), c1_subtree_operators.end()); other_tree.operations.insert(insert_point_c2, c1_subtree_operators.begin(), c1_subtree_operators.end());
} }
void tree_t::replace_subtree(const subtree_point_t point, const ptrdiff_t extent, tree_t& other_tree) void tree_t::replace_subtree(const subtree_point_t point, const ptrdiff_t extent, tree_t& other_tree)
@ -498,6 +498,13 @@ namespace blt::gp
return start; return start;
} }
tree_t& tree_t::get_thread_local(gp_program& program)
{
thread_local tree_t tree{program};
tree.clear(program);
return tree;
}
void tree_t::handle_operator_inserted(const op_container_t& op) void tree_t::handle_operator_inserted(const op_container_t& op)
{ {
if (m_program->is_operator_ephemeral(op.id())) if (m_program->is_operator_ephemeral(op.id()))