From 005a8026bb424779a146e00cc48621ff1d72b807 Mon Sep 17 00:00:00 2001 From: CptAlanSmith <123112708+CptAlanSmith@users.noreply.github.com> Date: Sat, 23 Sep 2023 19:25:15 +0100 Subject: Testing (#23) * Fixes for building scons * Initial proof of concept auto-testing Shows how we can pull loaded data and display it back * Re-did headless Because hubert insisted it be done like this ;) * Auto-Testing Framework Basics * Requirements Calculations * Fix for messy merge (teach me to use merge tools) * Fixing up misc merge issues to fully reconcile with master changes * Re-added missing getters * Move of testing files due to folder reorgs * Use new accessors + int reading fix --------- Co-authored-by: Hop311 --- src/openvic-simulation/economy/Good.cpp | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/openvic-simulation/economy/Good.cpp') diff --git a/src/openvic-simulation/economy/Good.cpp b/src/openvic-simulation/economy/Good.cpp index 027fb5f..943db00 100644 --- a/src/openvic-simulation/economy/Good.cpp +++ b/src/openvic-simulation/economy/Good.cpp @@ -3,9 +3,6 @@ #include #include #include -#include "dataloader/NodeTools.hpp" -#include "openvic-dataloader/v2script/AbstractSyntaxTree.hpp" -#include "types/fixed_point/FixedPoint.hpp" using namespace OpenVic; using namespace OpenVic::NodeTools; @@ -137,17 +134,3 @@ bool GoodManager::load_goods_file(ast::NodeCPtr root) { lock_goods(); return ret; } - -node_callback_t GoodManager::expect_goods_map(callback_t> cb) { - return [this, cb](ast::NodeCPtr node) -> bool { - std::map goods_map; - bool res = expect_good_dictionary([&goods_map](const Good & key, ast::NodeCPtr value) -> bool { - fixed_point_t good_value; - bool res = expect_fixed_point((assign_variable_callback(good_value)))(value); - goods_map.emplace(&key, good_value); - return res; - })(node); - res &= cb(goods_map); - return res; - }; -} \ No newline at end of file -- cgit v1.2.3-56-ga3b1