From e50c67eb1aaa54f5fb31425f81616bea4e6b880a Mon Sep 17 00:00:00 2001 From: hop311 Date: Thu, 12 Oct 2023 20:19:00 +0100 Subject: Lots of accumulated changes --- src/openvic-simulation/politics/Government.cpp | 134 ++++++++++++++----------- 1 file changed, 73 insertions(+), 61 deletions(-) (limited to 'src/openvic-simulation/politics/Government.cpp') diff --git a/src/openvic-simulation/politics/Government.cpp b/src/openvic-simulation/politics/Government.cpp index 869ac3d..1a48806 100644 --- a/src/openvic-simulation/politics/Government.cpp +++ b/src/openvic-simulation/politics/Government.cpp @@ -2,98 +2,110 @@ #include -#include "openvic-simulation/dataloader/NodeTools.hpp" #include "openvic-simulation/GameManager.hpp" using namespace OpenVic; using namespace OpenVic::NodeTools; -GovernmentType::GovernmentType(std::string_view new_identifier, std::vector new_ideologies, bool new_elections, bool new_appoint_ruling_party, Timespan new_election_duration, std::string_view new_flag_type_identifier) - : HasIdentifier { new_identifier }, ideologies { new_ideologies }, elections { new_elections }, appoint_ruling_party { new_appoint_ruling_party }, election_duration { new_election_duration }, flag_type_identifier { new_flag_type_identifier } {} +GovernmentType::GovernmentType(std::string_view new_identifier, std::vector&& new_ideologies, bool new_elections, bool new_appoint_ruling_party, Timespan new_term_duration, std::string_view new_flag_type_identifier) + : HasIdentifier { new_identifier }, ideologies { std::move(new_ideologies) }, elections { new_elections }, appoint_ruling_party { new_appoint_ruling_party }, term_duration { new_term_duration }, flag_type_identifier { new_flag_type_identifier } {} bool GovernmentType::is_ideology_compatible(Ideology const* ideology) const { - return std::find(ideologies.begin(), ideologies.end(), ideology) != ideologies.end(); + return std::find(ideologies.begin(), ideologies.end(), ideology) != ideologies.end(); } std::vector const& GovernmentType::get_ideologies() const { - return ideologies; + return ideologies; } bool GovernmentType::holds_elections() const { - return elections; + return elections; } bool GovernmentType::can_appoint_ruling_party() const { - return appoint_ruling_party; + return appoint_ruling_party; } -Timespan GovernmentType::get_election_duration() const { - return election_duration; +Timespan GovernmentType::get_term_duration() const { + return term_duration; } -std::string_view GovernmentType::get_flag_type() const { - return flag_type_identifier; +std::string const& GovernmentType::get_flag_type() const { + return flag_type_identifier; } GovernmentTypeManager::GovernmentTypeManager() : government_types { "government types" } {} -bool GovernmentTypeManager::add_government_type(std::string_view identifier, std::vector ideologies, bool elections, bool appoint_ruling_party, Timespan election_duration, std::string_view flag_type) { - if (identifier.empty()) { - Logger::error("Invalid government type identifier - empty!"); - return false; - } +bool GovernmentTypeManager::add_government_type(std::string_view identifier, std::vector ideologies, bool elections, bool appoint_ruling_party, Timespan term_duration, std::string_view flag_type) { + if (identifier.empty()) { + Logger::error("Invalid government type identifier - empty!"); + return false; + } - if (ideologies.empty()) { - Logger::error("No compatible ideologies defined for government type ", identifier); - return false; - } + if (ideologies.empty()) { + Logger::error("No compatible ideologies defined for government type ", identifier); + return false; + } - if (elections && election_duration == 0) { - Logger::error("No or invalid election duration for government type ", identifier); - return false; - } + if (elections && term_duration < 0) { + Logger::error("No or invalid term duration for government type ", identifier); + return false; + } - return government_types.add_item({ identifier, ideologies, elections, appoint_ruling_party, election_duration, flag_type }); + return government_types.add_item({ identifier, std::move(ideologies), elections, appoint_ruling_party, term_duration, flag_type }); } /* REQUIREMENTS: FS-525, SIM-27 */ bool GovernmentTypeManager::load_government_types_file(IdeologyManager const& ideology_manager, ast::NodeCPtr root) { - bool ret = expect_dictionary( - [this, &ideology_manager](std::string_view government_type_identifier, ast::NodeCPtr value) -> bool { - std::vector ideologies; - bool elections = false, appoint_ruling_party = false; - uint16_t election_duration = 0; /* in months */ - std::string_view flag_type_identifier = "republic"; - - bool ret = expect_dictionary_keys( - ALLOW_OTHER_KEYS, - "election", ONE_EXACTLY, expect_bool(assign_variable_callback(elections)), - "duration", ZERO_OR_ONE, expect_uint(assign_variable_callback_uint(election_duration)), - "appoint_ruling_party", ONE_EXACTLY, expect_bool(assign_variable_callback(appoint_ruling_party)), - "flagType", ZERO_OR_ONE, expect_identifier(assign_variable_callback(flag_type_identifier)) - )(value); - - ret &= expect_dictionary( - [this, &ideology_manager, &ideologies, government_type_identifier](std::string_view key, ast::NodeCPtr value) -> bool { - static const std::set> reserved_keys = { + bool ret = expect_dictionary_reserve_length( + government_types, + [this, &ideology_manager](std::string_view government_type_identifier, ast::NodeCPtr government_type_value) -> bool { + std::vector ideologies; + bool elections = false, appoint_ruling_party = false; + Timespan term_duration = 0; + std::string_view flag_type_identifier = "republic"; + + size_t total_expected_ideologies = 0; + bool ret = expect_dictionary_keys_and_default( + increment_callback(total_expected_ideologies), + "election", ONE_EXACTLY, expect_bool(assign_variable_callback(elections)), + "duration", ZERO_OR_ONE, expect_months(assign_variable_callback(term_duration)), + "appoint_ruling_party", ONE_EXACTLY, expect_bool(assign_variable_callback(appoint_ruling_party)), + "flagType", ZERO_OR_ONE, expect_identifier(assign_variable_callback(flag_type_identifier)) + )(government_type_value); + ideologies.reserve(total_expected_ideologies); + + ret &= expect_dictionary( + [this, &ideology_manager, &ideologies, government_type_identifier](std::string_view key, ast::NodeCPtr value) -> bool { + static const std::set> reserved_keys = { "election", "duration", "appoint_ruling_party", "flagType" }; - if (reserved_keys.find(key) != reserved_keys.end()) return true; - Ideology const* ideology = ideology_manager.get_ideology_by_identifier(key); - if (ideology == nullptr) { - Logger::error("When loading government type ", government_type_identifier, ", specified ideology ", key, " is invalid!"); - return false; - } - ideologies.push_back(ideology); - return true; - } - )(value); - - ret &= add_government_type(government_type_identifier, ideologies, elections, appoint_ruling_party, Timespan(election_duration * 30), flag_type_identifier); - return ret; - } - )(root); - lock_government_types(); - - return ret; + if (reserved_keys.find(key) != reserved_keys.end()) return true; + Ideology const* ideology = ideology_manager.get_ideology_by_identifier(key); + if (ideology == nullptr) { + Logger::error("When loading government type ", government_type_identifier, ", specified ideology ", key, " is invalid!"); + return false; + } + return expect_bool([&ideologies, ideology, government_type_identifier](bool val) -> bool { + if (val) { + if (std::find(ideologies.begin(), ideologies.end(), ideology) == ideologies.end()) { + ideologies.push_back(ideology); + return true; + } + Logger::error("Government type ", government_type_identifier, " marked as supporting ideology ", ideology->get_identifier()); + return false; + } + Logger::error("Government type ", government_type_identifier, " redundantly marked as not supporting ideology ", ideology->get_identifier(), " multiple times"); + return false; + })(value); + } + )(government_type_value); + + ret &= add_government_type(government_type_identifier, std::move(ideologies), elections, appoint_ruling_party, term_duration, flag_type_identifier); + return ret; + } + )(root); + lock_government_types(); + + return ret; } \ No newline at end of file -- cgit v1.2.3-56-ga3b1