diff --git a/.idea/editor.xml b/.idea/editor.xml
index b0d69ef..5fff85e 100644
--- a/.idea/editor.xml
+++ b/.idea/editor.xml
@@ -240,244 +240,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24877e8..1a0d7fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ macro(compile_options target_name)
sanitizers(${target_name})
endmacro()
-project(blt-gp VERSION 0.3.14)
+project(blt-gp VERSION 0.3.15)
include(CTest)
diff --git a/include/blt/gp/tree.h b/include/blt/gp/tree.h
index cca7f53..8a38ca3 100644
--- a/include/blt/gp/tree.h
+++ b/include/blt/gp/tree.h
@@ -169,6 +169,19 @@ namespace blt::gp
class tree_t
{
public:
+ struct child_t
+ {
+ ptrdiff_t start;
+ // one past the end
+ ptrdiff_t end;
+ };
+
+ struct subtree_point_t
+ {
+ ptrdiff_t pos;
+ type_id type;
+ };
+
explicit tree_t(gp_program& program);
tree_t(const tree_t& copy): m_program(copy.m_program)
@@ -236,13 +249,6 @@ namespace blt::gp
void clear(gp_program& program);
- struct child_t
- {
- ptrdiff_t start;
- // one past the end
- ptrdiff_t end;
- };
-
void insert_operator(const op_container_t& container)
{
operations.emplace_back(container);
@@ -276,8 +282,13 @@ namespace blt::gp
return values;
}
- blt::size_t get_depth(gp_program& program) const;
+ size_t get_depth(gp_program& program) const;
+ subtree_point_t select_subtree(double terminal_chance = 0.1) const;
+ std::optional select_subtree(type_id type, u32 max_tries = 5, double terminal_chance = 0.1) const;
+ subtree_point_t select_subtree_traverse(double terminal_chance = 0.1, double depth_multiplier = 0.6) const;
+ std::optional select_subtree_traverse(type_id type, u32 max_tries = 5, double terminal_chance = 0.1,
+ double depth_multiplier = 0.6) const;
/**
* User function for evaluating this tree using a context reference. This function should only be used if the tree is expecting the context value
@@ -344,12 +355,10 @@ namespace blt::gp
bool check(gp_program& program, void* context) const;
- void find_child_extends(gp_program& program, tracked_vector& vec, blt::size_t parent_node, blt::size_t argc) const;
+ void find_child_extends(tracked_vector& vec, blt::size_t parent_node, blt::size_t argc) const;
// places one past the end of the child. so it's [start, end)
- blt::ptrdiff_t find_endpoint(blt::gp::gp_program& program, blt::ptrdiff_t start) const;
-
- blt::ptrdiff_t find_parent(blt::gp::gp_program& program, blt::ptrdiff_t start) const;
+ [[nodiscard]] ptrdiff_t find_endpoint(blt::ptrdiff_t start) const;
// valid for [begin, end)
static size_t total_value_bytes(const detail::const_op_iter_t begin, const detail::const_op_iter_t end)
diff --git a/lib/blt b/lib/blt
index 7864ddc..4c462df 160000
--- a/lib/blt
+++ b/lib/blt
@@ -1 +1 @@
-Subproject commit 7864ddc4de9c89f1986f1918180883a5c3580a5b
+Subproject commit 4c462dff38a982bc5dc5212337af160bc018cce1
diff --git a/src/generators.cpp b/src/generators.cpp
index 366222e..718398a 100644
--- a/src/generators.cpp
+++ b/src/generators.cpp
@@ -27,8 +27,8 @@ namespace blt::gp
struct stack
{
- blt::gp::operator_id id;
- blt::size_t depth;
+ operator_id id;
+ size_t depth;
};
inline std::stack get_initial_stack(gp_program& program, type_id root_type)
@@ -49,10 +49,10 @@ namespace blt::gp
}
template
- inline void create_tree(tree_t& tree, Func&& perChild, const generator_arguments& args)
+ void create_tree(tree_t& tree, Func&& perChild, const generator_arguments& args)
{
std::stack tree_generator = get_initial_stack(args.program, args.root_type);
- blt::size_t max_depth = 0;
+ size_t max_depth = 0;
while (!tree_generator.empty())
{
diff --git a/src/transformers.cpp b/src/transformers.cpp
index e2b5b46..cdfd4d9 100644
--- a/src/transformers.cpp
+++ b/src/transformers.cpp
@@ -94,10 +94,10 @@ namespace blt::gp
{
// basic crossover
const auto crossover_point_begin_itr = c1_ops.begin() + point->p1_crossover_point;
- const auto crossover_point_end_itr = c1_ops.begin() + c1.find_endpoint(program, point->p1_crossover_point);
+ const auto crossover_point_end_itr = c1_ops.begin() + c1.find_endpoint(point->p1_crossover_point);
const auto found_point_begin_itr = c2_ops.begin() + point->p2_crossover_point;
- const auto found_point_end_itr = c2_ops.begin() + c2.find_endpoint(program, point->p2_crossover_point);
+ const auto found_point_end_itr = c2_ops.begin() + c2.find_endpoint(point->p2_crossover_point);
stack_allocator& c1_stack = c1.get_values();
stack_allocator& c2_stack = c2.get_values();
@@ -266,7 +266,7 @@ namespace blt::gp
point += 1;
// loop through all the children we wish to skip. The result will be the first node of the next child, becoming the new parent
for (size_t i = 0; i < argument; i++)
- point = t.find_endpoint(program, point);
+ point = t.find_endpoint(point);
continue;
}
@@ -298,7 +298,7 @@ namespace blt::gp
auto& vals_r = c.get_values();
auto begin_point = static_cast(node);
- auto end_point = c.find_endpoint(program, begin_point);
+ auto end_point = c.find_endpoint(begin_point);
auto begin_operator_id = ops_r[begin_point].id();
const auto& type_info = program.get_operator_info(begin_operator_id);
@@ -352,6 +352,8 @@ namespace blt::gp
auto copy = c;
try
{
+ if (!copy.check(program, detail::debug::context_ptr))
+ throw std::runtime_error("Tree check failed");
// TODO a work around for the whole needing to access a now private function
// const auto& result = copy.evaluate(*static_cast(detail::debug::context_ptr));
// blt::black_box(result);
@@ -434,7 +436,7 @@ namespace blt::gp
thread_local static tracked_vector children_data;
children_data.clear();
- c.find_child_extends(program, children_data, c_node, current_func_info.argument_types.size());
+ c.find_child_extends(children_data, c_node, current_func_info.argument_types.size());
for (const auto& [index, val] : blt::enumerate(replacement_func_info.argument_types))
{
@@ -593,7 +595,7 @@ namespace blt::gp
auto& replacement_func_info = program.get_operator_info(random_replacement);
auto new_argc = replacement_func_info.argc.argc;
// replacement function should be valid. let's make a copy of us.
- auto current_end = c.find_endpoint(program, static_cast(c_node));
+ auto current_end = c.find_endpoint(static_cast(c_node));
blt::size_t for_bytes = c.total_value_bytes(c_node, current_end);
blt::size_t after_bytes = c.total_value_bytes(current_end);
auto size = current_end - c_node;
@@ -677,7 +679,7 @@ namespace blt::gp
static thread_local tracked_vector child_data;
child_data.clear();
- c.find_child_extends(program, child_data, c_node, info.argument_types.size());
+ c.find_child_extends(child_data, c_node, info.argument_types.size());
auto child_index = child_data.size() - 1 - argument_index;
auto child = child_data[child_index];
@@ -762,7 +764,7 @@ namespace blt::gp
static thread_local tracked_vector child_data;
child_data.clear();
- c.find_child_extends(program, child_data, c_node, info.argument_types.size());
+ c.find_child_extends(child_data, c_node, info.argument_types.size());
auto from_index = child_data.size() - 1 - from;
auto to_index = child_data.size() - 1 - to;
diff --git a/src/tree.cpp b/src/tree.cpp
index a3798e9..4663c7b 100644
--- a/src/tree.cpp
+++ b/src/tree.cpp
@@ -188,13 +188,78 @@ namespace blt::gp
return depth;
}
- ptrdiff_t tree_t::find_endpoint(gp_program& program, ptrdiff_t start) const
+ tree_t::subtree_point_t tree_t::select_subtree(const double terminal_chance) const
+ {
+ do
+ {
+ const auto point = m_program->get_random().get_u64(0, operations.size());
+ const auto& info = m_program->get_operator_info(operations[point].id());
+ if (!info.argc.is_terminal())
+ return {static_cast(point), info.return_type};
+ if (m_program->get_random().choice(terminal_chance))
+ return {static_cast(point), info.return_type};
+ } while (true);
+ }
+
+ std::optional tree_t::select_subtree(const type_id type, const u32 max_tries, const double terminal_chance) const
+ {
+ for (u32 i = 0; i < max_tries; ++i)
+ {
+ if (const auto tree = select_subtree(terminal_chance); tree.type == type)
+ return tree;
+ }
+ return {};
+ }
+
+ tree_t::subtree_point_t tree_t::select_subtree_traverse(const double terminal_chance, const double depth_multiplier) const
+ {
+ size_t index = 0;
+ double depth = 0;
+ double exit_chance = 0;
+ while (true)
+ {
+ const auto& info = m_program->get_operator_info(operations[index].id());
+ if (info.argc.is_terminal())
+ {
+ if (m_program->get_random().choice(terminal_chance))
+ return {static_cast(index), info.return_type};
+ index = 0;
+ depth = 0;
+ exit_chance = 0;
+ continue;
+ }
+ if (m_program->get_random().choice(exit_chance))
+ return {static_cast(index), info.return_type};
+
+ const auto child = m_program->get_random().get_u32(0, info.argc.argc);
+ index++;
+ for (u32 i = 0; i < child; i++)
+ index = find_endpoint(static_cast(index));
+
+ ++depth;
+ exit_chance = 1.0 - (1.0 / (1 + depth * depth_multiplier * 0.5));
+ }
+ }
+
+ std::optional tree_t::select_subtree_traverse(const type_id type, const u32 max_tries, const double terminal_chance,
+ const double depth_multiplier) const
+ {
+ for (u32 i = 0; i < max_tries; ++i)
+ {
+ if (const auto tree = select_subtree_traverse(terminal_chance, depth_multiplier); tree.type == type)
+ return tree;
+ }
+ return {};
+ }
+
+
+ ptrdiff_t tree_t::find_endpoint(ptrdiff_t start) const
{
i64 children_left = 0;
do
{
- const auto& type = program.get_operator_info(operations[start].id());
+ const auto& type = m_program->get_operator_info(operations[start].id());
// this is a child to someone
if (children_left != 0)
children_left--;
@@ -207,27 +272,6 @@ namespace blt::gp
return start;
}
- // this function doesn't work!
- ptrdiff_t tree_t::find_parent(gp_program& program, ptrdiff_t start) const
- {
- i64 children_left = 0;
- do
- {
- if (start == 0)
- return 0;
- const auto& type = program.get_operator_info(operations[start].id());
- if (type.argc.argc > 0)
- children_left -= type.argc.argc;
- children_left++;
- if (children_left <= 0)
- break;
- --start;
- }
- while (true);
-
- return start;
- }
-
void tree_t::handle_operator_inserted(const op_container_t& op)
{
if (m_program->is_operator_ephemeral(op.id()))
@@ -288,6 +332,8 @@ namespace blt::gp
const auto v1 = results.values.bytes_in_head();
const auto v2 = static_cast(operations.front().type_size());
+
+ program.get_destroy_func(operations.front().id())(detail::destroy_t::RETURN, results.values);
if (v1 != v2)
{
const auto vd = std::abs(v1 - v2);
@@ -299,24 +345,24 @@ namespace blt::gp
return true;
}
- void tree_t::find_child_extends(gp_program& program, tracked_vector& vec, const size_t parent_node, const size_t argc) const
+ void tree_t::find_child_extends(tracked_vector& vec, const size_t parent_node, const size_t argc) const
{
while (vec.size() < argc)
{
- auto current_point = vec.size();
+ const auto current_point = vec.size();
child_t prev{};
if (current_point == 0)
{
// first child.
prev = {
static_cast(parent_node + 1),
- find_endpoint(program, static_cast(parent_node + 1))
+ find_endpoint(static_cast(parent_node + 1))
};
vec.push_back(prev);
continue;
}
prev = vec[current_point - 1];
- child_t next = {prev.end, find_endpoint(program, prev.end)};
+ child_t next = {prev.end, find_endpoint(prev.end)};
vec.push_back(next);
}
}
diff --git a/tests/drop_test.cpp b/tests/drop_test.cpp
index 3f541ba..fb0385d 100644
--- a/tests/drop_test.cpp
+++ b/tests/drop_test.cpp
@@ -108,6 +108,7 @@ bool fitness_function(const tree_t& current_tree, fitness_t& fitness, size_t)
constexpr static double value_cutoff = 1.e15;
for (auto& fitness_case : regression.get_training_cases())
{
+ BLT_GP_UPDATE_CONTEXT(fitness_case);
auto val = current_tree.get_evaluation_ref(fitness_case);
const auto diff = std::abs(fitness_case.y - val.get().value);
if (diff < value_cutoff)