From d432c2239524fdba1e3ff307937cb872cf87a46d Mon Sep 17 00:00:00 2001 From: Brett Date: Tue, 5 Mar 2024 00:23:43 -0500 Subject: [PATCH] not eval correctly --- CMakeLists.txt | 2 +- tests/src/tests2.cpp | 133 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 120 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4fa0f7..5f0f936 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ if(!MSVC) add_compile_options(-march=native) endif() -#set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD 17) add_subdirectory(libs/BLT) diff --git a/tests/src/tests2.cpp b/tests/src/tests2.cpp index 6285b1f..dcd75d5 100644 --- a/tests/src/tests2.cpp +++ b/tests/src/tests2.cpp @@ -89,14 +89,22 @@ namespace fb struct construct_info { type_t type; - bool choice; + double value; + + explicit construct_info(type_t type): type(type), value(0) + { + if (type == type_t::VALUE) + value = random_value(); + } }; + static_assert(std::is_trivially_copyable_v); + std::vector create_info(blt::size_t size) { std::vector info; - construct_info root = {random_type(), false}; + construct_info root = construct_info{random_type()}; std::stack> stack; stack.emplace(root, 0); while (!stack.empty()) @@ -111,9 +119,9 @@ namespace fb if (depth >= size) break; if (choice()) - stack.emplace(construct_info{random_type(), true}, depth + 1); + stack.emplace(construct_info{random_type()}, depth + 1); else - stack.emplace(construct_info{random_type_sub(), false}, depth + 1); + stack.emplace(construct_info{random_type_sub()}, depth + 1); } } @@ -133,11 +141,9 @@ namespace fb blt::i32 argc; type_t type; - explicit node_t(type_t type, blt::bump_allocator& alloc): alloc(alloc), argc(arg_c[static_cast(type)]), type(type) - { - if (type == type_t::VALUE) - value = random_value(); - } + explicit node_t(type_t type, double value, blt::bump_allocator& alloc): + alloc(alloc), value(value), argc(arg_c[static_cast(type)]), type(type) + {} void evaluate() { @@ -176,6 +182,7 @@ namespace fb while (!node_stack.empty()) { node_stack.top()->evaluate(); + BLT_DEBUG(node_stack.top()->value); node_stack.pop(); } return value; @@ -216,7 +223,7 @@ namespace fb // stack.emplace(assignment, depth + 1); // } // } - root = alloc.emplace(info[0].type, alloc); + root = alloc.emplace(info[0].type, info[0].value, alloc); blt::size_t index = 1; std::stack> stack; stack.emplace(root, 0); @@ -229,7 +236,8 @@ namespace fb for (blt::i32 i = 0; i < node->argc; i++) { auto& assignment = node->children[i]; - assignment = alloc.emplace(info[index++].type, alloc); + assignment = alloc.emplace(info[index].type, info[index].value, alloc); + index++; stack.emplace(assignment, depth + 1); } } @@ -249,28 +257,121 @@ namespace fb struct tree2 { + using index = blt::size_t; private: + inline static auto u(type_t type) + { + return static_cast(type); + } + struct node_t { double value; blt::i32 argc; type_t type; + + node_t() = default; + + node_t(type_t type, double value): value(value), argc(u(type)), type(type) + {} }; + + static_assert(std::is_trivially_copyable_v); + node_t* nodes = nullptr; blt::size_t size = 0; + public: tree2() = default; void create(const std::vector& info) { size = static_cast(std::pow(2, std::log2(info.size()) + 1)); + BLT_INFO("Size %ld, %ld, %ld", size, static_cast(std::log2(info.size())), info.size()); nodes = new node_t[size]; - for (blt::size_t i = 0; i < info; i++) - { + nodes[1] = node_t{info[0].type, info[0].value}; + blt::size_t index = 1; + std::stack> stack; + stack.emplace(1, 0); + while (!stack.empty()) + { + auto top = stack.top(); + auto node = top.first; + auto depth = top.second; + stack.pop(); + for (blt::i32 i = 0; i < nodes[node].argc; i++) + { + blt::u64 insert; + if (i & 1) + insert = right(node); + else + insert = left(node); + nodes[insert] = node_t{info[index].type, info[index].value}; + stack.emplace(index++, depth + 1); + } } } + static index left(index i) + { + return i * 2; + } + + static index right(index i) + { + return i * 2 + 1; + } + + double evaluate() + { + std::stack ns; + std::stack node_stack; + + ns.push(1); + + while (!ns.empty()) + { + auto top = ns.top(); + node_stack.push(top); + ns.pop(); + for (blt::i32 i = 0; i < nodes[top].argc; i++) + { + blt::u64 insert; + if (i & 1) + insert = right(top); + else + insert = left(top); + ns.push(insert); + } + } + + while (!node_stack.empty()) + { + auto top = node_stack.top(); + if (nodes[top].argc == 2) + { + switch (nodes[top].type) + { + case type_t::ADD: + nodes[top].value = nodes[left(top)].value + nodes[right(top)].value; + break; + case type_t::SUB: + nodes[top].value = nodes[left(top)].value - nodes[right(top)].value; + break; + case type_t::MUL: + nodes[top].value = nodes[left(top)].value * nodes[right(top)].value; + break; + case type_t::VALUE: + break; + } + } + BLT_DEBUG(nodes[top].value); + node_stack.pop(); + } + return nodes[1].value; + } + ~tree2() { delete[] nodes; @@ -279,9 +380,13 @@ namespace fb void funny() { - auto info = create_info(25); + auto info = create_info(17); tree1 love; love.create(info); BLT_TRACE(love.evaluate()); + + tree2 fem; + fem.create(info); + BLT_TRACE(fem.evaluate()); } } \ No newline at end of file