From f227d1fb1cab381ee93218fafdc4729b723475f7 Mon Sep 17 00:00:00 2001 From: Brett Laptop Date: Sat, 10 Aug 2024 16:43:49 -0400 Subject: [PATCH] static check, still errors --- CMakeLists.txt | 2 +- Testing/Temporary/CTestCostData.txt | 1 + Testing/Temporary/LastTest.log | 3 +++ include/config.h | 2 +- lib/blt-gp | 2 +- src/custom_transformer.cpp | 4 +--- 6 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 Testing/Temporary/CTestCostData.txt create mode 100644 Testing/Temporary/LastTest.log diff --git a/CMakeLists.txt b/CMakeLists.txt index bd9a3a5..a9a176e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.25) -project(image-gp-6 VERSION 0.0.30) +project(image-gp-6 VERSION 0.0.31) include(FetchContent) diff --git a/Testing/Temporary/CTestCostData.txt b/Testing/Temporary/CTestCostData.txt new file mode 100644 index 0000000..ed97d53 --- /dev/null +++ b/Testing/Temporary/CTestCostData.txt @@ -0,0 +1 @@ +--- diff --git a/Testing/Temporary/LastTest.log b/Testing/Temporary/LastTest.log new file mode 100644 index 0000000..4bd9cf0 --- /dev/null +++ b/Testing/Temporary/LastTest.log @@ -0,0 +1,3 @@ +Start testing: Aug 10 16:33 EDT +---------------------------------------------------------- +End testing: Aug 10 16:33 EDT diff --git a/include/config.h b/include/config.h index 38a0b77..e32ee5f 100644 --- a/include/config.h +++ b/include/config.h @@ -27,7 +27,7 @@ inline constexpr size_t log2(size_t n) // NOLINT } inline const blt::u64 SEED = std::random_device()(); -//inline const blt::u64 SEED = 553372510; +//inline const blt::u64 SEED = 125003014; inline constexpr blt::size_t IMAGE_SIZE = 128; inline constexpr blt::size_t IMAGE_PADDING = 16; inline constexpr blt::size_t POP_SIZE = 64; diff --git a/lib/blt-gp b/lib/blt-gp index 502ea6e..8ee64b5 160000 --- a/lib/blt-gp +++ b/lib/blt-gp @@ -1 +1 @@ -Subproject commit 502ea6ea36246de0a9ad6f67d9085796d3c0cf5b +Subproject commit 8ee64b5666cf9d1dc308ff629bd4c7ef14b0c96a diff --git a/src/custom_transformer.cpp b/src/custom_transformer.cpp index 2cad86a..bff9a72 100644 --- a/src/custom_transformer.cpp +++ b/src/custom_transformer.cpp @@ -253,7 +253,6 @@ namespace blt::gp // not enough args blt::size_t total_bytes_after = 0; blt::size_t start_index = c_node + 1; - blt::size_t insert_index = c_node + 1; //if (current_func_info.argc.argc != 0) // start_index = children_data.back().end; for (blt::size_t i = start_index; i < ops.size(); i++) @@ -287,13 +286,12 @@ namespace blt::gp ops.insert(ops.begin() + static_cast(start_index), tree.get_operations().begin(), tree.get_operations().end()); start_index += tree.get_operations().size(); - insert_index += tree.get_operations().size(); } vals.copy_from(data, total_bytes_after); } // now finally update the type. ops[c_node] = {replacement_func_info.function, program.get_typesystem().get_type(replacement_func_info.return_type).size(), - random_replacement, false}; + random_replacement, program.is_static(random_replacement)}; } else { blt::size_t bytes_from_head = 0;