From 0eea2189e37a372f7a012a07120ee0aed2b1646a Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 3 Apr 2025 13:44:59 -0400 Subject: [PATCH] silly drop test update --- CMakeLists.txt | 2 +- commit.py | 2 +- lib/blt | 2 +- tests/drop_test.cpp | 17 +++++++++-------- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95f4f43..0db9989 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.4.4) +project(blt-gp VERSION 0.4.5) include(CTest) diff --git a/commit.py b/commit.py index b39f82d..c95a67a 100755 --- a/commit.py +++ b/commit.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!python3 import subprocess diff --git a/lib/blt b/lib/blt index 9a05c86..284743c 160000 --- a/lib/blt +++ b/lib/blt @@ -1 +1 @@ -Subproject commit 9a05c86b02c9c45c2b384c531007416148ec4b56 +Subproject commit 284743c683aebae3277f64a07cdd0deedf629039 diff --git a/tests/drop_test.cpp b/tests/drop_test.cpp index 1513b1f..509a7fb 100644 --- a/tests/drop_test.cpp +++ b/tests/drop_test.cpp @@ -17,7 +17,7 @@ */ #include "../examples/symbolic_regression.h" #include -#include +#include using namespace blt::gp; @@ -140,10 +140,11 @@ int main() auto& program = regression.get_program(); static auto sel = select_tournament_t{}; - program.generate_population(program.get_typesystem().get_type().id(), fitness_function, sel, sel, sel); + program.generate_initial_population(program.get_typesystem().get_type().id()); + program.setup_generational_evaluation(fitness_function, sel, sel, sel); while (!program.should_terminate()) { - BLT_TRACE("---------------{Begin Generation %lu}---------------", program.get_current_generation()); + BLT_TRACE("---------------\\{Begin Generation {}}---------------", program.get_current_generation()); BLT_TRACE("Creating next generation"); program.create_next_generation(); BLT_TRACE("Move to next generation"); @@ -158,10 +159,10 @@ int main() regression.get_program().next_generation(); regression.get_program().get_current_pop().clear(); - BLT_TRACE("Created %ld times", normal_construct.load()); - BLT_TRACE("Dropped %ld times", normal_drop.load()); - BLT_TRACE("Ephemeral created %ld times", ephemeral_construct.load()); - BLT_TRACE("Ephemeral dropped %ld times", ephemeral_drop.load()); - BLT_TRACE("Max allocated %ld times", max_allocated.load()); + BLT_TRACE("Created {} times", normal_construct.load()); + BLT_TRACE("Dropped {} times", normal_drop.load()); + BLT_TRACE("Ephemeral created {} times", ephemeral_construct.load()); + BLT_TRACE("Ephemeral dropped {} times", ephemeral_drop.load()); + BLT_TRACE("Max allocated {} times", max_allocated.load()); }