silly

CMakeLists.txt

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

examples/symbolic_regression.h

@@ -20,7 +20,7 @@
 #define BLT_GP_EXAMPLE_SYMBOLIC_REGRESSION_H
 
 #include "examples_base.h"
-#include <blt/std/logging.h>
+#include <blt/logging/logging.h>
 #include <blt/format/format.h>
 #include <iostream>
 

include/blt/gp/allocator.h

@@ -20,7 +20,7 @@
 #define BLT_GP_ALLOCATOR_H
 
 #include <blt/std/types.h>
-#include <blt/std/logging.h>
+#include <blt/logging/logging.h>
 #include <blt/gp/util/trackers.h>
 #include <cstdlib>
 #include <vector>

include/blt/gp/fwdecl.h

@@ -20,7 +20,7 @@
 #define BLT_GP_FWDECL_H
 
 #include <functional>
-#include <blt/std/logging.h>
+#include <blt/logging/logging.h>
 #include <blt/std/types.h>
 #include <ostream>
 #include <cstdlib>

include/blt/gp/selection.h

@@ -61,16 +61,16 @@ namespace blt::gp
                 {
                     for (size_t i = 0; i < config.elites; i++)
                     {
-                        if (ind.value.fitness.adjusted_fitness >= values[i].second)
+                        if (ind.second.fitness.adjusted_fitness >= values[i].second)
                         {
                             bool doesnt_contain = true;
                             for (blt::size_t j = 0; j < config.elites; j++)
                             {
-                                if (ind.index == values[j].first)
+                                if (ind.first == values[j].first)
                                     doesnt_contain = false;
                             }
                             if (doesnt_contain)
-                                values[i] = {ind.index, ind.value.fitness.adjusted_fitness};
+                                values[i] = {ind.first, ind.second.fitness.adjusted_fitness};
                             break;
                         }
                     }

include/blt/gp/stack.h

@@ -22,7 +22,7 @@
 #include <blt/std/types.h>
 #include <blt/std/bump_allocator.h>
 #include <blt/std/assert.h>
-#include <blt/std/logging.h>
+#include <blt/logging/logging.h>
 #include <blt/std/allocator.h>
 #include <blt/std/ranges.h>
 #include <blt/meta/meta.h>

lib/blt

@@ -1 +1 @@
-Subproject commit baa5952666594ce0d07a2b013e46c4bc343ba164
+Subproject commit 9a05c86b02c9c45c2b384c531007416148ec4b56

src/generators.cpp

@@ -17,7 +17,7 @@
  */
 #include <blt/gp/generators.h>
 #include <blt/gp/program.h>
-#include <blt/std/logging.h>
+#include <blt/logging/logging.h>
 #include <stack>
 
 namespace blt::gp

src/tree.cpp

@@ -18,7 +18,7 @@
 #include <blt/gp/tree.h>
 #include <blt/gp/stack.h>
 #include <blt/std/assert.h>
-#include <blt/std/logging.h>
+#include <blt/logging/logging.h>
 #include <blt/gp/program.h>
 #include <stack>
 
@@ -544,7 +544,7 @@ namespace blt::gp
 
         if (bytes_expected != bytes_size)
         {
-            BLT_ERROR_STREAM << "Stack state: " << values.size() << "\n";
+            BLT_ERROR("Stack state: {}", values.size());
             BLT_ERROR("Child tree bytes %ld vs expected %ld, difference: %ld", bytes_size, bytes_expected,
                       static_cast<ptrdiff_t>(bytes_expected) - static_cast<ptrdiff_t>(bytes_size));
             BLT_ERROR("Amount of bytes in stack doesn't match the number of bytes expected for the operations");

src/util/trackers.cpp

@@ -16,7 +16,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include <blt/gp/util/trackers.h>
-#include <blt/std/logging.h>
+#include <blt/logging/logging.h>
 #include "blt/format/format.h"
 #include <numeric>