Fix Data Types

2 files changed, 29 insertions, 21 deletions

diff --git a/src/openvic-simulation/politics/Government.cpp b/src/openvic-simulation/politics/Government.cpp
index 76617a8..869ac3d 100644
--- a/src/openvic-simulation/politics/Government.cpp
+++ b/src/openvic-simulation/politics/Government.cpp
@@ -8,13 +8,17 @@
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
 
-GovernmentType::GovernmentType(std::string_view new_identifier, std::vector<std::string> new_ideologies, bool new_elections, bool new_appoint_ruling_party, uint16_t new_election_duration, std::string_view new_flag_type_identifier)
+GovernmentType::GovernmentType(std::string_view new_identifier, std::vector<Ideology const*> 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 } {}
 
-bool GovernmentType::is_ideology_compatible(std::string_view ideology) const {
+bool GovernmentType::is_ideology_compatible(Ideology const* ideology) const {
     return std::find(ideologies.begin(), ideologies.end(), ideology) != ideologies.end();
 }
 
+std::vector<Ideology const*> const& GovernmentType::get_ideologies() const {
+    return ideologies;
+}
+
 bool GovernmentType::holds_elections() const {
     return elections;
 }
@@ -23,7 +27,7 @@ bool GovernmentType::can_appoint_ruling_party() const {
     return appoint_ruling_party;
 }
 
-uint16_t GovernmentType::get_election_duration() const {
+Timespan GovernmentType::get_election_duration() const {
     return election_duration;
 }
 
@@ -33,7 +37,7 @@ std::string_view GovernmentType::get_flag_type() const {
 
 GovernmentTypeManager::GovernmentTypeManager() : government_types { "government types" } {}
 
-bool GovernmentTypeManager::add_government_type(std::string_view identifier, std::vector<std::string> ideologies, bool elections, bool appoint_ruling_party, uint16_t election_duration, std::string_view flag_type) {
+bool GovernmentTypeManager::add_government_type(std::string_view identifier, std::vector<Ideology const*> 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;
@@ -53,16 +57,15 @@ bool GovernmentTypeManager::add_government_type(std::string_view identifier, std
 }
 
 /* REQUIREMENTS: FS-525, SIM-27 */
-bool GovernmentTypeManager::load_government_types_file(IdeologyManager& ideology_manager, ast::NodeCPtr root) {
+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<std::string> ideologies;
+            std::vector<Ideology const*> ideologies;
             bool elections = false, appoint_ruling_party = false;
-            uint16_t election_duration = 0;
+            uint16_t election_duration = 0; /* in months */
             std::string_view flag_type_identifier = "republic";
 
-            bool ret = expect_dictionary_keys_and_length(
-                default_length_callback,
+            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)),
@@ -71,18 +74,22 @@ bool GovernmentTypeManager::load_government_types_file(IdeologyManager& ideology
             )(value);
 
             ret &= expect_dictionary(
-                [this, &ideology_manager, &ideologies](std::string_view key, ast::NodeCPtr value) -> bool {
+                [this, &ideology_manager, &ideologies, government_type_identifier](std::string_view key, ast::NodeCPtr value) -> bool {
                     static const std::set<std::string, std::less<void>> reserved_keys = {
 						"election", "duration", "appoint_ruling_party", "flagType"
 					};
                     if (reserved_keys.find(key) != reserved_keys.end()) return true;
-                    if (ideology_manager.get_ideology_by_identifier(key) == nullptr) return false;
-                    ideologies.push_back(std::string{key});
+                    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, election_duration, flag_type_identifier);
+            ret &= add_government_type(government_type_identifier, ideologies, elections, appoint_ruling_party, Timespan(election_duration * 30), flag_type_identifier);
             return ret;
         }
     )(root);
diff --git a/src/openvic-simulation/politics/Government.hpp b/src/openvic-simulation/politics/Government.hpp
index a3642fb..a8fc00f 100644
--- a/src/openvic-simulation/politics/Government.hpp
+++ b/src/openvic-simulation/politics/Government.hpp
@@ -10,20 +10,21 @@ namespace OpenVic {
         friend struct GovernmentTypeManager;
 
     private:
-        std::vector<std::string> ideologies;
+        std::vector<Ideology const*> ideologies;
         const bool elections, appoint_ruling_party;
-        const uint16_t election_duration;
-        const std::string_view flag_type_identifier;
+        const Timespan election_duration;
+        const std::string flag_type_identifier;
 
-        GovernmentType(std::string_view new_identifier, std::vector<std::string> new_ideologies, bool new_elections, bool new_appoint_ruling_party, uint16_t new_election_duration, std::string_view new_flag_type_identifier);
+        GovernmentType(std::string_view new_identifier, std::vector<Ideology const*> new_ideologies, bool new_elections, bool new_appoint_ruling_party, Timespan new_election_duration, std::string_view new_flag_type_identifier);
 
     public:
         GovernmentType(GovernmentType&&) = default;
 
-        bool is_ideology_compatible(std::string_view ideology) const;
+        bool is_ideology_compatible(Ideology const* ideology) const;
+        std::vector<Ideology const*> const& get_ideologies() const;
         bool holds_elections() const;
         bool can_appoint_ruling_party() const;
-        uint16_t get_election_duration() const;
+        Timespan get_election_duration() const;
         std::string_view get_flag_type() const;
     };
 
@@ -34,9 +35,9 @@ namespace OpenVic {
     public:
         GovernmentTypeManager();
 
-        bool add_government_type(std::string_view identifier, std::vector<std::string> ideologies, bool elections, bool appoint_ruling_party, uint16_t election_duration, std::string_view flag_type);
+        bool add_government_type(std::string_view identifier, std::vector<Ideology const*> ideologies, bool elections, bool appoint_ruling_party, Timespan election_duration, std::string_view flag_type);
         IDENTIFIER_REGISTRY_ACCESSORS(GovernmentType, government_type)
 
-        bool load_government_types_file(IdeologyManager& ideology_manager, ast::NodeCPtr root);
+        bool load_government_types_file(IdeologyManager const& ideology_manager, ast::NodeCPtr root);
     };
 } // namespace OpenVic