From 2d4ae109df63503d79b16af691d0bfe6b3ac5b01 Mon Sep 17 00:00:00 2001
From: Brett Laptop <tri11paragon@tpgc.me>
Date: Mon, 12 Aug 2024 20:36:21 -0400
Subject: [PATCH] prepare for gc

---
 CMakeLists.txt            |  2 +-
 include/blt/gp/program.h  |  8 ++------
 include/blt/gp/tree.h     |  1 +
 src/tree.cpp              | 14 ++++++++++----
 tests/destructor_test.cpp |  6 +++---
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 960c4c8..46822a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.25)
-project(blt-gp VERSION 0.0.139)
+project(blt-gp VERSION 0.0.140)
 
 include(CTest)
 
diff --git a/include/blt/gp/program.h b/include/blt/gp/program.h
index f044f4a..6d3c091 100644
--- a/include/blt/gp/program.h
+++ b/include/blt/gp/program.h
@@ -399,6 +399,7 @@ namespace blt::gp
             
             void next_generation()
             {
+                current_pop.drop(*this);
                 current_pop = std::move(next_pop);
                 current_generation++;
             }
@@ -543,12 +544,7 @@ namespace blt::gp
             
             ~gp_program()
             {
-                std::cout << ("Destroying Program!") << std::endl;
-                for (auto& pop : current_pop.get_individuals())
-                {
-                    pop.tree.drop(*this);
-                    pop = {};
-                }
+                current_pop.drop(*this);
                 thread_helper.lifetime_over = true;
                 thread_helper.barrier.notify_all();
                 thread_helper.thread_function_condition.notify_all();
diff --git a/include/blt/gp/tree.h b/include/blt/gp/tree.h
index adbe430..841aed1 100644
--- a/include/blt/gp/tree.h
+++ b/include/blt/gp/tree.h
@@ -337,6 +337,7 @@ namespace blt::gp
             
             population_t& operator=(population_t&&) = default;
         
+            void drop(gp_program& program);
         private:
             std::vector<individual> individuals;
     };
diff --git a/src/tree.cpp b/src/tree.cpp
index a9de1f2..5514847 100644
--- a/src/tree.cpp
+++ b/src/tree.cpp
@@ -291,7 +291,7 @@ namespace blt::gp
         return;
         if (values.empty())
             return;
-        std::cout << "---- NEW TREE ---- References " << *reference_counter << " ----" << std::endl;
+        //std::cout << "---- NEW TREE ---- References " << *reference_counter << " ----" << std::endl;
         if (reference_counter->load() > 1)
             return;
         static blt::hashset_t<blt::size_t> sets;
@@ -305,18 +305,24 @@ namespace blt::gp
                     float* f;
                     blt::size_t i;
                 };
-                auto h = values.from<hello>(0);
-                if (sets.find(h.i) != sets.end())
+                //auto h = values.from<hello>(0);
+                /*if (sets.find(h.i) != sets.end())
                     std::cout << "HEY ASSHOLE Duplicate Value " << h.i << std::endl;
                 else
                 {
                     std::cout << "Destroying Value " << h.i << std::endl;
                     sets.insert(h.i);
-                }
+                }*/
                 program.get_destroy_func(operation.id)(detail::destroy_t::RETURN, nullptr, values);
                 values.pop_bytes(static_cast<blt::ptrdiff_t>(stack_allocator::aligned_size(operation.type_size)));
             }
             operations.pop_back();
         }
     }
+    
+    void population_t::drop(gp_program& program)
+    {
+        for (auto& pop : get_individuals())
+            pop.tree.drop(program);
+    }
 }
\ No newline at end of file
diff --git a/tests/destructor_test.cpp b/tests/destructor_test.cpp
index 5bf05b8..a340449 100644
--- a/tests/destructor_test.cpp
+++ b/tests/destructor_test.cpp
@@ -113,9 +113,9 @@ blt::gp::prog_config_t config = blt::gp::prog_config_t()
         .set_initial_min_tree_size(2)
         .set_initial_max_tree_size(6)
         .set_elite_count(0)
-        .set_crossover_chance(0.9)
-        .set_mutation_chance(0.1)
-        .set_reproduction_chance(0)
+        .set_crossover_chance(0)
+        .set_mutation_chance(0)
+        .set_reproduction_chance(1.0)
         .set_max_generations(5)
         .set_pop_size(500)
         .set_thread_count(0);