silly trees, there's a memory leak

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.25)
-project(blt-gp VERSION 0.0.37)
+project(blt-gp VERSION 0.0.38)
 
 include(CTest)
 
@@ -72,5 +72,6 @@ if (${BUILD_EXAMPLES})
     blt_add_example(blt-gp1 examples/gp_test_1.cpp)
     blt_add_example(blt-gp2 examples/gp_test_2.cpp)
     blt_add_example(blt-gp3 examples/gp_test_3.cpp)
+    blt_add_example(blt-gp4 examples/gp_test_4.cpp)
 
 endif ()

examples/gp_test_3.cpp

@@ -82,6 +82,4 @@ int main()
     BLT_TRACE(value);
     
     return 0;
-    
-    return 0;
 }

examples/gp_test_4.cpp

@@ -0,0 +1,89 @@
+/*
+ *  <Short Description>
+ *  Copyright (C) 2024  Brett Terpstra
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include <blt/gp/program.h>
+#include <blt/gp/generators.h>
+#include <blt/gp/tree.h>
+#include <blt/std/logging.h>
+
+static constexpr long SEED = 41912;
+
+blt::gp::type_system type_system;
+blt::gp::gp_program program(type_system, std::mt19937_64{SEED}); // NOLINT
+
+blt::gp::operation_t add([](float a, float b) { return a + b; });
+blt::gp::operation_t sub([](float a, float b) { return a - b; });
+blt::gp::operation_t mul([](float a, float b) { return a * b; });
+blt::gp::operation_t pro_div([](float a, float b) { return b == 0 ? 0.0f : a / b; });
+
+blt::gp::operation_t op_if([](bool b, float a, float c) { return b ? a : c; });
+blt::gp::operation_t eq_f([](float a, float b) { return a == b; });
+blt::gp::operation_t eq_b([](bool a, bool b) { return a == b; });
+blt::gp::operation_t lt([](float a, float b) { return a < b; });
+blt::gp::operation_t gt([](float a, float b) { return a > b; });
+blt::gp::operation_t op_and([](bool a, bool b) { return a && b; });
+blt::gp::operation_t op_or([](bool a, bool b) { return a || b; });
+blt::gp::operation_t op_xor([](bool a, bool b) { return static_cast<bool>(a ^ b); });
+blt::gp::operation_t op_not([](bool b) { return !b; });
+
+blt::gp::operation_t lit([]() {
+    //static std::uniform_real_distribution<float> dist(-32000, 32000);
+    static std::uniform_real_distribution<float> dist(0.0f, 10.0f);
+    return dist(program.get_random());
+});
+
+/**
+ * This is a test using multiple types with blt::gp
+ */
+int main()
+{
+    type_system.register_type<float>();
+    type_system.register_type<bool>();
+    
+    blt::gp::gp_operations silly{type_system};
+    silly.add_operator(add);
+    silly.add_operator(sub);
+    silly.add_operator(mul);
+    silly.add_operator(pro_div);
+    
+    silly.add_operator(op_if);
+    silly.add_operator(eq_f);
+    silly.add_operator(eq_b);
+    silly.add_operator(lt);
+    silly.add_operator(gt);
+    silly.add_operator(op_and);
+    silly.add_operator(op_or);
+    silly.add_operator(op_xor);
+    silly.add_operator(op_not);
+    
+    silly.add_operator(lit, true);
+    
+    program.set_operations(std::move(silly));
+    
+    blt::gp::ramped_half_initializer_t pop_init;
+    
+    auto pop = pop_init.generate(blt::gp::initializer_arguments{program, type_system.get_type<float>().id(), 500, 3, 10});
+    
+    for (auto& tree : pop.getIndividuals())
+    {
+        auto value = tree.get_evaluation_value<float>(nullptr);
+        
+        BLT_TRACE(value);
+    }
+    
+    return 0;
+}

include/blt/gp/program.h

@@ -173,6 +173,20 @@ namespace blt::gp
                 return non_terminals[id][dist(engine)];
             }
             
+//            inline operator_id select_non_terminal_too_deep(type_id id)
+//            {
+//                std::uniform_int_distribution<blt::size_t> dist(0, non_terminals[id].size() - 1);
+//                operator_id sel;
+//                do
+//                {
+//                    sel = non_terminals[id][dist(engine)];
+//                } while (std::find_if(argument_types[sel].begin(), argument_types[sel].end(),
+//                                      [id](const auto& v) {
+//                                          return v.id() == id;
+//                                      }) != argument_types[sel].end());
+//                return sel;
+//            }
+            
             inline std::vector<type>& get_argument_types(operator_id id)
             {
                 return argument_types[id];

include/blt/gp/transformers.h

@@ -0,0 +1,27 @@
+#pragma once
+/*
+ *  Copyright (C) 2024  Brett Terpstra
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef BLT_GP_TRANSFORMERS_H
+#define BLT_GP_TRANSFORMERS_H
+
+namespace blt::gp
+{
+
+}
+
+#endif //BLT_GP_TRANSFORMERS_H

src/transformers.cpp

@@ -0,0 +1,23 @@
+/*
+ *  <Short Description>
+ *  Copyright (C) 2024  Brett Terpstra
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include <blt/gp/transformers.h>
+
+namespace blt::gp
+{
+
+}