From 84deeffe04d730064e89b4ceaf508f3f30113ea9 Mon Sep 17 00:00:00 2001 From: hop311 Date: Sun, 27 Oct 2024 11:59:12 +0000 Subject: Finish ConditionalWeight base key parsing (including days/months/years) --- src/openvic-simulation/scripts/ConditionalWeight.hpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/openvic-simulation/scripts/ConditionalWeight.hpp') diff --git a/src/openvic-simulation/scripts/ConditionalWeight.hpp b/src/openvic-simulation/scripts/ConditionalWeight.hpp index f667cd7..fcab0a6 100644 --- a/src/openvic-simulation/scripts/ConditionalWeight.hpp +++ b/src/openvic-simulation/scripts/ConditionalWeight.hpp @@ -14,7 +14,7 @@ namespace OpenVic { using condition_weight_item_t = std::variant; enum class base_key_t : uint8_t { - BASE, FACTOR, MONTHS + BASE, FACTOR, TIME }; using enum base_key_t; @@ -31,15 +31,6 @@ namespace OpenVic { ConditionalWeight(scope_type_t new_initial_scope, scope_type_t new_this_scope, scope_type_t new_from_scope); ConditionalWeight(ConditionalWeight&&) = default; - static constexpr std::string_view base_key_to_string(base_key_t base_key) { - switch (base_key) { - case base_key_t::BASE: return "base"; - case base_key_t::FACTOR: return "factor"; - case base_key_t::MONTHS: return "months"; // TODO - add functionality for days or months or years - default: return "INVALID BASE KEY"; - } - } - NodeTools::node_callback_t expect_conditional_weight(base_key_t base_key); bool parse_scripts(DefinitionManager const& definition_manager); -- cgit v1.2.3-56-ga3b1