tri11paragon
/
blt-gp
mirror of https://github.com/tri11paragon/blt-gp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow early exit from program using fitness function. returning true will now halt exeuction.

thread
Brett 2024-08-06 03:51:13 -04:00
parent 19f94b14dc
commit 7a10a10196
4 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.25)
project(blt-gp VERSION 0.0.118)
project(blt-gp VERSION 0.0.119)
include(CTest)

2
examples/symbolic_regression.cpp
View File

@ -76,7 +76,7 @@ constexpr auto fitness_function = [](blt::gp::tree_t& current_tree, blt::gp::fit
}
fitness.standardized_fitness = fitness.raw_fitness;
fitness.adjusted_fitness = (1.0 / (1.0 + fitness.standardized_fitness));
//BLT_TRACE("fitness: %lf raw: %lf", fitness.adjusted_fitness, fitness.raw_fitness);
return fitness.hits == fitness_cases.size();
};
float example_function(float x)

28
include/blt/gp/program.h
View File

@ -141,10 +141,12 @@ namespace blt::gp
storage.operators.push_back(info);
storage.print_funcs.push_back([&op](std::ostream& out, stack_allocator& stack) {
if constexpr (blt::meta::is_streamable_v<Return>) {
if constexpr (blt::meta::is_streamable_v<Return>)
{
out << stack.pop<Return>();
(void) (op); // remove warning
} else {
} else
{
out << "[Printing Value on '" << (op.get_name() ? *op.get_name() : "") << "' Not Supported!]";
}
});
@ -283,6 +285,7 @@ namespace blt::gp
template<typename FitnessFunc>
void generate_population(type_id root_type, FitnessFunc& fitness_function, bool eval_fitness_now = true)
{
using LambdaReturn = typename decltype(blt::meta::lambda_helper(fitness_function))::Return;
current_pop = config.pop_initializer.get().generate(
{*this, root_type, config.population_size, config.initial_min_tree_size, config.initial_max_tree_size});
if (config.threads == 1)
@ -290,8 +293,17 @@ namespace blt::gp
BLT_INFO("Starting with single thread variant!");
thread_execution_service = new std::function([this, &fitness_function](blt::size_t) {
for (const auto& ind : blt::enumerate(current_pop.get_individuals()))
{
if constexpr (std::is_same_v<LambdaReturn, bool> || std::is_convertible_v<LambdaReturn, bool>)
{
auto result = fitness_function(ind.second.tree, ind.second.fitness, ind.first);
if (result)
fitness_should_exit = true;
} else
{
fitness_function(ind.second.tree, ind.second.fitness, ind.first);
}
if (ind.second.fitness.adjusted_fitness > current_stats.best_fitness)
current_stats.best_fitness = ind.second.fitness.adjusted_fitness;
@ -325,7 +337,16 @@ namespace blt::gp
{
auto& ind = current_pop.get_individuals()[i];
if constexpr (std::is_same_v<LambdaReturn, bool> || std::is_convertible_v<LambdaReturn, bool>)
{
auto result = fitness_function(ind.tree, ind.fitness, i);
if (result)
fitness_should_exit = true;
} else
{
fitness_function(ind.tree, ind.fitness, i);
}
auto old_best = current_stats.best_fitness.load(std::memory_order_relaxed);
while (ind.fitness.adjusted_fitness > old_best &&
@ -407,7 +428,7 @@ namespace blt::gp
[[nodiscard]] bool should_terminate() const
{
return current_generation >= config.max_generations;
return current_generation >= config.max_generations || fitness_should_exit;
}
[[nodiscard]] bool should_thread_terminate() const
@ -520,6 +541,7 @@ namespace blt::gp
population_stats current_stats{};
population_t next_pop;
std::atomic_uint64_t current_generation = 0;
bool fitness_should_exit = false;
blt::u64 seed;
prog_config_t config{};

2
lib/blt

@ -1 +1 @@
Subproject commit f9938691ecb13b7b6acb2402235015bef9d58982
Subproject commit 3e8b616bf9d0513824d4452e3e77fccac910f0fb